Tenant/Owner

Test Tenant and Owner
Refactor few functions on bother controller, the one very smiliar