Tweaked User ability to be a bit cleaner. Fixed all the broken test from adding the researcher group.