Expand test coverage