Role test fixes
Merge pull request #552 from somayjain/newbranch

Role test fixes