diff --git a/src/cliAgent.ts b/src/cliAgent.ts
index 481d8b34..820db044 100644
--- a/src/cliAgent.ts
+++ b/src/cliAgent.ts
@@ -76,7 +76,10 @@ export type RestAgentModules = Awaited<ReturnType<typeof getModules>>
 const getWithTenantModules = (networkConfig: [IndyVdrPoolConfig, ...IndyVdrPoolConfig[]]) => {
   const modules = getModules(networkConfig)
   return {
-    tenants: new TenantsModule<typeof modules>({}),
+    tenants: new TenantsModule<typeof modules>({
+      sessionAcquireTimeout: Infinity,
+      sessionLimit: Infinity
+    }),
     ...modules
   }
 }
diff --git a/src/controllers/multi-tenancy/MultiTenancyController.ts b/src/controllers/multi-tenancy/MultiTenancyController.ts
index 5c4dc9cd..5ce0dee7 100644
--- a/src/controllers/multi-tenancy/MultiTenancyController.ts
+++ b/src/controllers/multi-tenancy/MultiTenancyController.ts
@@ -864,7 +864,7 @@ export class MultiTenancyController extends Controller {
 
             const credentialMessage = offerOob.message;
             const outOfBandRecord = await tenantAgent.oob.createInvitation({
-                label: 'test-connection',
+                label: createOfferOptions.label,
                 handshakeProtocols: [HandshakeProtocol.Connections],
                 messages: [credentialMessage],
                 autoAcceptConnection: true
@@ -1049,7 +1049,7 @@ export class MultiTenancyController extends Controller {
 
             const proofMessage = proof.message;
             const outOfBandRecord = await tenantAgent.oob.createInvitation({
-                label: 'test-connection',
+                label: createRequestOptions.label,
                 handshakeProtocols: [HandshakeProtocol.Connections],
                 messages: [proofMessage],
                 autoAcceptConnection: true