Minor tweaks to RoleCtrl and TestCtrl tests