small tests refactor