Updated tests to not require tenantId