Refactoring compiles and tests are ok