refactoring finished, tests isn't happy