adapt tests to new role concept