Refactoring, tests are not compiling