Code and Test Refactoring.