Trying new refactoring against working tests.