Refactoring user tests