edit test in user_admin_spec
merge conflict fixed