Added further test cases and modified http client behavior to use tenant_name vs. tenant_id