Test refactoring part 1 of X