Append entity role
Modify entity scheme. refs #1
Refactoring testRoleSet refs #1