Refactored test to fit in with naming convention
Merge remote-tracking branch 'awanoodle/UpdateRoleBasedFeatureTests'