User tests refactored for clearness