Fixes tests to handle the new role list