Expanded test coverage