Refactoring to achieve 100% coverage.