Refactoring, testing