Refactored user tests