Big one with test refactorings