Changes to the RBAC DSL and test files