Test refactor, move