Fixed failing tenant unit tests