Expanded test coverage for new functionality