Added extra coverage for tenant model descriptor class access
Validate relations between tenant and non-tenant on class definition
Removed unused code path and enhanced test coverage