Refactoring, Testing & Code Coverage