Merge "Refactor test_user_update"