Making tests compatible with RBAC

Change-Id: Ibbaaaa124a554bed9db5c15c1e7dac45bb0108fb
Merge "Making tests compatible with RBAC"