Merge "added test cases in EPRoleTest.java"