- tests refactoring