Get tests passing by changing roleis to roles in macros
Get tests passing by changing roleis to roles in macros

MartinJNash/Royce,MartinJNash/Royce,grzlus/Royce,vgvinay2/Royce,vgvinay2/Royce,grzlus/Royce,grzlus/Royce,vgvinay2/Royce,MartinJNash/Royce