CodeCoverage: Corner cases / refactoring