First refactor of user tests