Final first test refactoring