user tests refactored