Updates the tests to use the roles instead