diff --git a/src/MQTTnet.Extensions.MultiCloud.AzureIoTClient/HubMqttClient.cs b/src/MQTTnet.Extensions.MultiCloud.AzureIoTClient/HubMqttClient.cs
index ec31d5f..58018ae 100644
--- a/src/MQTTnet.Extensions.MultiCloud.AzureIoTClient/HubMqttClient.cs
+++ b/src/MQTTnet.Extensions.MultiCloud.AzureIoTClient/HubMqttClient.cs
@@ -50,7 +50,7 @@ public async Task<string> GetTwinAsync(CancellationToken cancellationToken = def
 
         public async Task<int> UpdateTwinAsync(object payload, CancellationToken cancellationToken = default)
         {
-            var twin = await updateTwinBinder.InvokeAsync(Connection.Options.ClientId, JsonSerializer.Serialize(payload), cancellationToken);
+            var twin = await updateTwinBinder.InvokeAsync(Connection.Options.ClientId, payload, cancellationToken);
             return twin;
         }
 
diff --git a/src/MQTTnet.Extensions.MultiCloud.BrokerIoTClient/Untyped/GenericCommandClient.cs b/src/MQTTnet.Extensions.MultiCloud.BrokerIoTClient/Untyped/GenericCommandClient.cs
index cdfc5b4..1b15560 100644
--- a/src/MQTTnet.Extensions.MultiCloud.BrokerIoTClient/Untyped/GenericCommandClient.cs
+++ b/src/MQTTnet.Extensions.MultiCloud.BrokerIoTClient/Untyped/GenericCommandClient.cs
@@ -36,6 +36,8 @@ public GenericCommandClient(IMqttClient client)
                 {
                     _tcs!.SetException(new ApplicationException("Invalid correlation data"));
                 }
+                
+                // TODO: Review UserProps retrieval (3 and 5)
                 //var up = m.ApplicationMessage.UserProperties.FirstOrDefault(p => p.Name.Equals("status"));
                 //int status = up != null ? int.Parse(up.Value) : 500;
 
diff --git a/tests/MQTTnet.Extensions.MultiCloud.IntegrationTests/IoTHubConnectionFixture.cs b/tests/MQTTnet.Extensions.MultiCloud.IntegrationTests/IoTHubConnectionFixture.cs
index aaf0f50..fd06e7b 100644
--- a/tests/MQTTnet.Extensions.MultiCloud.IntegrationTests/IoTHubConnectionFixture.cs
+++ b/tests/MQTTnet.Extensions.MultiCloud.IntegrationTests/IoTHubConnectionFixture.cs
@@ -97,15 +97,16 @@ public async Task ModuleCert()
             await client.DisconnectAsync();
         }
 
-        [Fact(Skip ="Required edgeHub-local")]
+        //Fact(Skip ="Required edgeHub-local")]
+        [Fact]
         public async Task ModuleSasUsingEdgeHub()
         {
             var cs = new ConnectionSettings()
             {
                 HostName = "rido-edges.azure-devices.net",
                 DeviceId = "riduntu22",
-                ModuleId = "MyFilterModule",
-                SharedAccessKey = "xidAoWNigrri7dAV/NynNFvOCTTgyTjlUIGoHI6wxyk=",
+                ModuleId = "ModuleOne",
+                SharedAccessKey = "c+ZZs5grZizn/RHj7vWjTvboY+wQ5sWu9PFfchJVybk=",
                 GatewayHostName = "localhost"
             };
             var connAck = await client!.ConnectAsync(new MqttClientOptionsBuilder()
diff --git a/tests/MQTTnet.Extensions.MultiCloud.IntegrationTests/e2e/GenericCommandE2EFixture.cs b/tests/MQTTnet.Extensions.MultiCloud.IntegrationTests/e2e/GenericCommandE2EFixture.cs
index 4297bd4..5c9705b 100644
--- a/tests/MQTTnet.Extensions.MultiCloud.IntegrationTests/e2e/GenericCommandE2EFixture.cs
+++ b/tests/MQTTnet.Extensions.MultiCloud.IntegrationTests/e2e/GenericCommandE2EFixture.cs
@@ -17,7 +17,8 @@ private static ConnectionSettings TestCS(string clientId)
             TcpPort = 1883,
             UserName = "user",
             Password = "password",
-            ClientId = clientId
+            ClientId = clientId,
+            MqttVersion = 5
         };
     }