more tenancy tweaks and working on tests