diff --git a/transforms/csdl/preprocess_csdl_test_input.xml b/transforms/csdl/preprocess_csdl_test_input.xml
index 5d66ec39..fcba4993 100644
--- a/transforms/csdl/preprocess_csdl_test_input.xml
+++ b/transforms/csdl/preprocess_csdl_test_input.xml
@@ -116,7 +116,7 @@
             </EntityType>
 			<EntityType Name="workbookFunctionResult" BaseType="graph.entity">
 				<Property Name="error" Type="Edm.String" />
-				<Property Name="value" Type="Edm.Untyped" />
+				<Property Name="value" Type="graph.Json" />
 			</EntityType>
             <EntityType Name="authenticationEventsFlow" BaseType="graph.entity" Abstract="true" OpenType="true">
                 <Property Name="conditions" Type="graph.authenticationConditions">
@@ -245,13 +245,6 @@
                     </Record>
                 </Annotation>
             </Annotations>
-            <Annotations Target="microsoft.graph.entitlementManagement/accessPackageAssignments">
-                <Annotation Term="Org.OData.Capabilities.V1.DeleteRestrictions">
-                    <Record>
-                        <PropertyValue Property="Deletable" Bool="false" />
-                    </Record>
-                </Annotation>
-            </Annotations>
             <Annotations Target="microsoft.graph.team/photo">
                 <Annotation Term="Org.OData.Capabilities.V1.InsertRestrictions">
                     <Record>
@@ -444,9 +437,9 @@
             </Function>
 			<Action Name="days360" IsBound="true">
 				<Parameter Name="bindparameter" Type="graph.workbookFunctions" />
-				<Parameter Name="startDate" Type="Edm.Untyped" />
-				<Parameter Name="endDate" Type="Edm.Untyped" />
-				<Parameter Name="method" Type="Edm.Untyped" />
+				<Parameter Name="startDate" Type="graph.Json" />
+				<Parameter Name="endDate" Type="graph.Json" />
+				<Parameter Name="method" Type="graph.Json" />
 				<ReturnType Type="graph.workbookFunctionResult" />
 			</Action>
             <Action Name="add" IsBound="true">
diff --git a/transforms/csdl/preprocess_csdl_test_output.xml b/transforms/csdl/preprocess_csdl_test_output.xml
index d8ae67d6..26f29099 100644
--- a/transforms/csdl/preprocess_csdl_test_output.xml
+++ b/transforms/csdl/preprocess_csdl_test_output.xml
@@ -565,7 +565,7 @@
       </EntityType>
       <EntityType Name="workbookFunctionResult" BaseType="graph.entity">
         <Property Name="error" Type="Edm.String" />
-        <Property Name="value" Type="Edm.Untyped" />
+        <Property Name="value" Type="graph.Json" />
       </EntityType>
       <EntityType Name="authenticationEventsFlow" BaseType="graph.entity" Abstract="true" OpenType="true">
         <Property Name="conditions" Type="graph.authenticationConditions">
@@ -745,7 +745,6 @@
           </Record>
         </Annotation>
       </Annotations>
-      <Annotations Target="microsoft.graph.entitlementManagement/accessPackageAssignments" />
       <Annotations Target="microsoft.graph.team/photo">
         <Annotation Term="Org.OData.Capabilities.V1.InsertRestrictions">
           <Record>
@@ -1191,9 +1190,9 @@
       </Function>
       <Action Name="days360" IsBound="true">
         <Parameter Name="bindparameter" Type="graph.workbookFunctions" />
-        <Parameter Name="startDate" Type="Edm.Untyped" />
-        <Parameter Name="endDate" Type="Edm.Untyped" />
-        <Parameter Name="method" Type="Edm.Untyped" />
+        <Parameter Name="startDate" Type="graph.Json" />
+        <Parameter Name="endDate" Type="graph.Json" />
+        <Parameter Name="method" Type="graph.Json" />
         <ReturnType Type="graph.workbookFunctionResult" />
       </Action>
       <Action Name="add" IsBound="true">
@@ -1519,6 +1518,13 @@
           </Record>
         </Annotation>
       </Annotations>
+      <Annotations Target="microsoft.graph.entitlementManagement/accessPackageAssignments">
+        <Annotation Term="Org.OData.Capabilities.V1.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false" />
+          </Record>
+        </Annotation>
+      </Annotations>
     </Schema>
     <Schema Namespace="microsoft.graph.callRecords" xmlns="http://docs.oasis-open.org/odata/ns/edm">
       <EnumType Name="callType">