Tenants API Tenant Model - Tests Parity.

1. Refactored the tenant model and test as per tenant tests parity requirements.

Change-Id: I32d60759ab01bafb3e582e8f891f2a5030ec9b03
Merge "Tenants API Tenant Model - Tests Parity."