Issue #1600892 by tim.plunkett, sun: Fixed Tests use magic numbers 1 and 2 instead of user role constants.