Updates to tests for new role annotations