tests refactored
tests refactored