Expand value test coverage