Fixed UsersController tests. Updated spec_helper require ordering