Enhance code coverage to 100%