Migrated to roles.
Added mset test
Merge branch 'role-rename' into test