Enhance code coverage