tests refactoring
tests refactoring