Test refactoring part 2