Be more specific in some of the tests which tenant a test is for.