test refactors