added tenants services and tests