diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/model/implementation/AcceptedImpl.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/model/implementation/AcceptedImpl.java
index c2734b3078ed..8ac24d4adb12 100644
--- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/model/implementation/AcceptedImpl.java
+++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/model/implementation/AcceptedImpl.java
@@ -329,7 +329,7 @@ public static <T, InnerT> Accepted<T> newAccepted(
                 activationResponse,
                 client.getSerializerAdapter(),
                 client.getHttpPipeline(),
-                client.getDefaultPollInterval(),
+                SdkContext.getDelayDuration(client.getDefaultPollInterval()),
                 innerType, innerType,
                 convertOperation);
 
diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/implementation/TypeSerializationTests.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/implementation/TypeSerializationTests.java
index c5376985889d..e462e4cd7196 100644
--- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/implementation/TypeSerializationTests.java
+++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/implementation/TypeSerializationTests.java
@@ -9,13 +9,13 @@
 import com.azure.resourcemanager.resources.fluent.inner.DeploymentExtendedInner;
 import com.azure.resourcemanager.resources.fluent.inner.DeploymentInner;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import java.lang.reflect.Field;
+
 public class TypeSerializationTests {
 
     @Test
-    @Disabled("To fix later as swagger changes on DeploymentExtendedInner")
     public void testDeploymentSerialization() throws Exception {
         final String templateJson = "{ \"/subscriptions/<redacted>/resourceGroups/<redacted>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<redacted>\": {} }";
 
@@ -27,11 +27,15 @@ public void testDeploymentSerialization() throws Exception {
         Assertions.assertTrue(deploymentJson.contains("Microsoft.ManagedIdentity"));
     }
 
-    private static DeploymentInner createRequestFromInner(DeploymentImpl deployment) {
+    private static DeploymentInner createRequestFromInner(DeploymentImpl deployment) throws NoSuchFieldException, IllegalAccessException {
+        Field field = DeploymentImpl.class.getDeclaredField("deploymentCreateUpdateParameters");
+        field.setAccessible(true);
+        DeploymentInner implInner = (DeploymentInner) field.get(deployment);
+
         DeploymentInner inner = new DeploymentInner()
                 .withProperties(new DeploymentProperties());
         inner.properties().withMode(deployment.mode());
-        //inner.properties().withTemplate(deployment.template());
+        inner.properties().withTemplate(implInner.properties().template());
         inner.properties().withTemplateLink(deployment.templateLink());
         inner.properties().withParameters(deployment.parameters());
         inner.properties().withParametersLink(deployment.parametersLink());