Refactoring and test hits