Code coverage refactoring