Test refactoring

:clap: :clap: