Test refactoring

Test refactoring