small tests refactoring