Check the correct role values
Fixed test to include correct tenant IDs and make mocks return correct things