Improved tests for roles