Enhance test coverage