Extend test coverage