Can we adjust the tests to make sure that the tenant object is returned ?