Fix to role tests

Adds fixes for the remaining role tets.