un-ruined the user tests