Test refactoring

None