Test refactoring

:+1: