TenantExtensions updates + additional unit tests