Test refactoring

:imp: