diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestCustomerKeyAsSegment.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestCustomerKeyAsSegment.txt
index acedec9c..66c6d0ae 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestCustomerKeyAsSegment.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestCustomerKeyAsSegment.txt
@@ -1,3 +1 @@
-{
-  "@odata.context":"http://localhost/api/Northwind/$metadata#Customers/$entity","CustomerID":"BLONP","CompanyName":"Blondesddsl p\u00e8re et fils","ContactName":"Fr\u00e9d\u00e9rique Citeaux","ContactTitle":"Marketing Manager","Address":"24, place Kl\u00e9ber","City":"Strasbourg","Region":null,"PostalCode":"67000","CountryRegion":"France","Phone":"88.60.15.31","Fax":"88.60.15.32"
-}
\ No newline at end of file
+{"@odata.context":"http://localhost/api/Northwind/$metadata#Customers/$entity","CustomerID":"BLONP","CompanyName":"Blondesddsl p\u00e8re et fils","ContactName":"Fr\u00e9d\u00e9rique Citeaux","ContactTitle":"Marketing Manager","Address":"24, place Kl\u00e9ber","City":"Strasbourg","Region":null,"PostalCode":"67000","CountryRegion":"France","Phone":"88.60.15.31","Fax":"88.60.15.32"}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestCustomersEntitySetQuery.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestCustomersEntitySetQuery.txt
index b8343236..72277342 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestCustomersEntitySetQuery.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestCustomersEntitySetQuery.txt
@@ -1,27 +1 @@
-{
-  "@odata.context":"http://localhost/api/Northwind/$metadata#Customers","value":[
-    {
-      "CustomerID":"BLONP","CompanyName":"Blondesddsl p\u00e8re et fils","ContactName":"Fr\u00e9d\u00e9rique Citeaux","ContactTitle":"Marketing Manager","Address":"24, place Kl\u00e9ber","City":"Strasbourg","Region":null,"PostalCode":"67000","CountryRegion":"France","Phone":"88.60.15.31","Fax":"88.60.15.32"
-    },{
-      "CustomerID":"BONAP","CompanyName":"Bon app'","ContactName":"Laurence Lebihan","ContactTitle":"Owner","Address":"12, rue des Bouchers","City":"Marseille","Region":null,"PostalCode":"13008","CountryRegion":"France","Phone":"91.24.45.40","Fax":"91.24.45.41"
-    },{
-      "CustomerID":"DUMON","CompanyName":"Du monde entier","ContactName":"Janine Labrune","ContactTitle":"Owner","Address":"67, rue des Cinquante Otages","City":"Nantes","Region":null,"PostalCode":"44000","CountryRegion":"France","Phone":"40.67.88.88","Fax":"40.67.89.89"
-    },{
-      "CustomerID":"FOLIG","CompanyName":"Folies gourmandes","ContactName":"Martine Ranc\u00e9","ContactTitle":"Assistant Sales Agent","Address":"184, chauss\u00e9e de Tournai","City":"Lille","Region":null,"PostalCode":"59000","CountryRegion":"France","Phone":"20.16.10.16","Fax":"20.16.10.17"
-    },{
-      "CustomerID":"FRANR","CompanyName":"France restauration","ContactName":"Carine Schmitt","ContactTitle":"Marketing Manager","Address":"54, rue Royale","City":"Nantes","Region":null,"PostalCode":"44000","CountryRegion":"France","Phone":"40.32.21.21","Fax":"40.32.21.20"
-    },{
-      "CustomerID":"LACOR","CompanyName":"La corne d'abondance","ContactName":"Daniel Tonini","ContactTitle":"Sales Representative","Address":"67, avenue de l'Europe","City":"Versailles","Region":null,"PostalCode":"78000","CountryRegion":"France","Phone":"30.59.84.10","Fax":"30.59.85.11"
-    },{
-      "CustomerID":"LAMAI","CompanyName":"La maison d'Asie","ContactName":"Annette Roulet","ContactTitle":"Sales Manager","Address":"1 rue Alsace-Lorraine","City":"Toulouse","Region":null,"PostalCode":"31000","CountryRegion":"France","Phone":"61.77.61.10","Fax":"61.77.61.11"
-    },{
-      "CustomerID":"PARIS","CompanyName":"Paris sp\u00e9cialit\u00e9s","ContactName":"Marie Bertrand","ContactTitle":"Owner","Address":"265, boulevard Charonne","City":"Paris","Region":null,"PostalCode":"75012","CountryRegion":"France","Phone":"(1) 42.34.22.66","Fax":"(1) 42.34.22.77"
-    },{
-      "CustomerID":"SPECD","CompanyName":"Sp\u00e9cialit\u00e9s du monde","ContactName":"Dominique Perrier","ContactTitle":"Marketing Manager","Address":"25, rue Lauriston","City":"Paris","Region":null,"PostalCode":"75016","CountryRegion":"France","Phone":"(1) 47.55.60.10","Fax":"(1) 47.55.60.20"
-    },{
-      "CustomerID":"VICTE","CompanyName":"Victuailles en stock","ContactName":"Mary Saveley","ContactTitle":"Sales Agent","Address":"2, rue du Commerce","City":"Lyon","Region":null,"PostalCode":"69004","CountryRegion":"France","Phone":"78.32.54.86","Fax":"78.32.54.87"
-    },{
-      "CustomerID":"VINET","CompanyName":"Vins et alcools Chevalier","ContactName":"Paul Henriot","ContactTitle":"Accounting Manager","Address":"59 rue de l'Abbaye","City":"Reims","Region":null,"PostalCode":"51100","CountryRegion":"France","Phone":"26.47.15.10","Fax":"26.47.15.11"
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost/api/Northwind/$metadata#Customers","value":[{"CustomerID":"BLONP","CompanyName":"Blondesddsl p\u00e8re et fils","ContactName":"Fr\u00e9d\u00e9rique Citeaux","ContactTitle":"Marketing Manager","Address":"24, place Kl\u00e9ber","City":"Strasbourg","Region":null,"PostalCode":"67000","CountryRegion":"France","Phone":"88.60.15.31","Fax":"88.60.15.32"},{"CustomerID":"BONAP","CompanyName":"Bon app'","ContactName":"Laurence Lebihan","ContactTitle":"Owner","Address":"12, rue des Bouchers","City":"Marseille","Region":null,"PostalCode":"13008","CountryRegion":"France","Phone":"91.24.45.40","Fax":"91.24.45.41"},{"CustomerID":"DUMON","CompanyName":"Du monde entier","ContactName":"Janine Labrune","ContactTitle":"Owner","Address":"67, rue des Cinquante Otages","City":"Nantes","Region":null,"PostalCode":"44000","CountryRegion":"France","Phone":"40.67.88.88","Fax":"40.67.89.89"},{"CustomerID":"FOLIG","CompanyName":"Folies gourmandes","ContactName":"Martine Ranc\u00e9","ContactTitle":"Assistant Sales Agent","Address":"184, chauss\u00e9e de Tournai","City":"Lille","Region":null,"PostalCode":"59000","CountryRegion":"France","Phone":"20.16.10.16","Fax":"20.16.10.17"},{"CustomerID":"FRANR","CompanyName":"France restauration","ContactName":"Carine Schmitt","ContactTitle":"Marketing Manager","Address":"54, rue Royale","City":"Nantes","Region":null,"PostalCode":"44000","CountryRegion":"France","Phone":"40.32.21.21","Fax":"40.32.21.20"},{"CustomerID":"LACOR","CompanyName":"La corne d'abondance","ContactName":"Daniel Tonini","ContactTitle":"Sales Representative","Address":"67, avenue de l'Europe","City":"Versailles","Region":null,"PostalCode":"78000","CountryRegion":"France","Phone":"30.59.84.10","Fax":"30.59.85.11"},{"CustomerID":"LAMAI","CompanyName":"La maison d'Asie","ContactName":"Annette Roulet","ContactTitle":"Sales Manager","Address":"1 rue Alsace-Lorraine","City":"Toulouse","Region":null,"PostalCode":"31000","CountryRegion":"France","Phone":"61.77.61.10","Fax":"61.77.61.11"},{"CustomerID":"PARIS","CompanyName":"Paris sp\u00e9cialit\u00e9s","ContactName":"Marie Bertrand","ContactTitle":"Owner","Address":"265, boulevard Charonne","City":"Paris","Region":null,"PostalCode":"75012","CountryRegion":"France","Phone":"(1) 42.34.22.66","Fax":"(1) 42.34.22.77"},{"CustomerID":"SPECD","CompanyName":"Sp\u00e9cialit\u00e9s du monde","ContactName":"Dominique Perrier","ContactTitle":"Marketing Manager","Address":"25, rue Lauriston","City":"Paris","Region":null,"PostalCode":"75016","CountryRegion":"France","Phone":"(1) 47.55.60.10","Fax":"(1) 47.55.60.20"},{"CustomerID":"VICTE","CompanyName":"Victuailles en stock","ContactName":"Mary Saveley","ContactTitle":"Sales Agent","Address":"2, rue du Commerce","City":"Lyon","Region":null,"PostalCode":"69004","CountryRegion":"France","Phone":"78.32.54.86","Fax":"78.32.54.87"},{"CustomerID":"VINET","CompanyName":"Vins et alcools Chevalier","ContactName":"Paul Henriot","ContactTitle":"Accounting Manager","Address":"59 rue de l'Abbaye","City":"Reims","Region":null,"PostalCode":"51100","CountryRegion":"France","Phone":"26.47.15.10","Fax":"26.47.15.11"}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestGetNorthwindMetadata.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestGetNorthwindMetadata.txt
index f016ded6..f60f186f 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestGetNorthwindMetadata.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/Baselines/TestGetNorthwindMetadata.txt
@@ -1,274 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
-  <edmx:DataServices>
-    <Schema Namespace="Microsoft.OData.Service.Sample.Northwind.Models" xmlns="http://docs.oasis-open.org/odata/ns/edm">
-      <EntityType Name="Category">
-        <Key>
-          <PropertyRef Name="CategoryID" />
-        </Key>
-        <Property Name="CategoryID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="CategoryName" Type="Edm.String" Nullable="false" />
-        <Property Name="Description" Type="Edm.String" />
-        <Property Name="Picture" Type="Edm.Binary" />
-        <NavigationProperty Name="Products" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Product)" />
-      </EntityType>
-      <EntityType Name="Product">
-        <Key>
-          <PropertyRef Name="ProductID" />
-        </Key>
-        <Property Name="ProductID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="ProductName" Type="Edm.String" Nullable="false" />
-        <Property Name="SupplierID" Type="Edm.Int32" />
-        <Property Name="CategoryID" Type="Edm.Int32" />
-        <Property Name="QuantityPerUnit" Type="Edm.String" />
-        <Property Name="UnitPrice" Type="Edm.Decimal" />
-        <Property Name="UnitsInStock" Type="Edm.Int16" />
-        <Property Name="UnitsOnOrder" Type="Edm.Int16" />
-        <Property Name="ReorderLevel" Type="Edm.Int16" />
-        <Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" />
-        <NavigationProperty Name="Category" Type="Microsoft.OData.Service.Sample.Northwind.Models.Category">
-          <ReferentialConstraint Property="CategoryID" ReferencedProperty="CategoryID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Order_Details" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail)" />
-        <NavigationProperty Name="Supplier" Type="Microsoft.OData.Service.Sample.Northwind.Models.Supplier">
-          <ReferentialConstraint Property="SupplierID" ReferencedProperty="SupplierID" />
-        </NavigationProperty>
-      </EntityType>
-      <EntityType Name="Order_Detail">
-        <Key>
-          <PropertyRef Name="OrderID" />
-          <PropertyRef Name="ProductID" />
-        </Key>
-        <Property Name="OrderID" Type="Edm.Int32" />
-        <Property Name="ProductID" Type="Edm.Int32" />
-        <Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" />
-        <Property Name="Quantity" Type="Edm.Int16" Nullable="false" />
-        <Property Name="Discount" Type="Edm.Single" Nullable="false" />
-        <NavigationProperty Name="Order" Type="Microsoft.OData.Service.Sample.Northwind.Models.Order">
-          <ReferentialConstraint Property="OrderID" ReferencedProperty="OrderID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Product" Type="Microsoft.OData.Service.Sample.Northwind.Models.Product">
-          <ReferentialConstraint Property="ProductID" ReferencedProperty="ProductID" />
-        </NavigationProperty>
-      </EntityType>
-      <EntityType Name="Order">
-        <Key>
-          <PropertyRef Name="OrderID" />
-        </Key>
-        <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="CustomerID" Type="Edm.String" />
-        <Property Name="EmployeeID" Type="Edm.Int32" />
-        <Property Name="OrderDate" Type="Edm.Date" />
-        <Property Name="RequiredDate" Type="Edm.Date" />
-        <Property Name="ShippedDate" Type="Edm.Date" />
-        <Property Name="ShipVia" Type="Edm.Int32" />
-        <Property Name="Freight" Type="Edm.Decimal" />
-        <Property Name="ShipName" Type="Edm.String" />
-        <Property Name="ShipAddress" Type="Edm.String" />
-        <Property Name="ShipCity" Type="Edm.String" />
-        <Property Name="ShipRegion" Type="Edm.String" />
-        <Property Name="ShipPostalCode" Type="Edm.String" />
-        <Property Name="ShipCountry" Type="Edm.String" />
-        <NavigationProperty Name="Customer" Type="Microsoft.OData.Service.Sample.Northwind.Models.Customer">
-          <ReferentialConstraint Property="CustomerID" ReferencedProperty="CustomerID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Employee" Type="Microsoft.OData.Service.Sample.Northwind.Models.Employee">
-          <ReferentialConstraint Property="EmployeeID" ReferencedProperty="EmployeeID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Order_Details" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail)" />
-        <NavigationProperty Name="Shipper" Type="Microsoft.OData.Service.Sample.Northwind.Models.Shipper" />
-      </EntityType>
-      <EntityType Name="Customer">
-        <Key>
-          <PropertyRef Name="CustomerID" />
-        </Key>
-        <Property Name="CustomerID" Type="Edm.String" Nullable="false" />
-        <Property Name="CompanyName" Type="Edm.String" Nullable="false" />
-        <Property Name="ContactName" Type="Edm.String" />
-        <Property Name="ContactTitle" Type="Edm.String" />
-        <Property Name="Address" Type="Edm.String" />
-        <Property Name="City" Type="Edm.String" />
-        <Property Name="Region" Type="Edm.String" />
-        <Property Name="PostalCode" Type="Edm.String" />
-        <Property Name="CountryRegion" Type="Edm.String" />
-        <Property Name="Phone" Type="Edm.String" />
-        <Property Name="Fax" Type="Edm.String" />
-        <NavigationProperty Name="Orders" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order)" />
-        <NavigationProperty Name="CustomerDemographics" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.CustomerDemographic)" />
-      </EntityType>
-      <EntityType Name="CustomerDemographic">
-        <Key>
-          <PropertyRef Name="CustomerTypeID" />
-        </Key>
-        <Property Name="CustomerTypeID" Type="Edm.String" Nullable="false" />
-        <Property Name="CustomerDesc" Type="Edm.String" />
-        <NavigationProperty Name="Customers" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Customer)" />
-      </EntityType>
-      <EntityType Name="Employee">
-        <Key>
-          <PropertyRef Name="EmployeeID" />
-        </Key>
-        <Property Name="EmployeeID" Type="Edm.Int32" />
-        <Property Name="LastName" Type="Edm.String" Nullable="false" />
-        <Property Name="FirstName" Type="Edm.String" Nullable="false" />
-        <Property Name="Title" Type="Edm.String" />
-        <Property Name="TitleOfCourtesy" Type="Edm.String" />
-        <Property Name="BirthDate" Type="Edm.Date" />
-        <Property Name="HireDate" Type="Edm.Date" />
-        <Property Name="Address" Type="Edm.String" />
-        <Property Name="City" Type="Edm.String" />
-        <Property Name="Region" Type="Edm.String" />
-        <Property Name="PostalCode" Type="Edm.String" />
-        <Property Name="CountryRegion" Type="Edm.String" />
-        <Property Name="HomePhone" Type="Edm.String" />
-        <Property Name="Extension" Type="Edm.String" />
-        <Property Name="Photo" Type="Edm.Binary" />
-        <Property Name="Notes" Type="Edm.String" />
-        <Property Name="ReportsTo" Type="Edm.Int32" />
-        <Property Name="PhotoPath" Type="Edm.String" />
-        <NavigationProperty Name="Employees1" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Employee)" />
-        <NavigationProperty Name="Employee1" Type="Microsoft.OData.Service.Sample.Northwind.Models.Employee">
-          <ReferentialConstraint Property="EmployeeID" ReferencedProperty="EmployeeID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Orders" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order)" />
-        <NavigationProperty Name="Territories" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Territory)" />
-      </EntityType>
-      <EntityType Name="Territory">
-        <Key>
-          <PropertyRef Name="TerritoryID" />
-        </Key>
-        <Property Name="TerritoryID" Type="Edm.String" Nullable="false" />
-        <Property Name="TerritoryDescription" Type="Edm.String" Nullable="false" />
-        <Property Name="RegionID" Type="Edm.Int32" />
-        <NavigationProperty Name="Region" Type="Microsoft.OData.Service.Sample.Northwind.Models.Region">
-          <ReferentialConstraint Property="RegionID" ReferencedProperty="RegionID" />
-        </NavigationProperty>
-        <NavigationProperty Name="Employees" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Employee)" />
-      </EntityType>
-      <EntityType Name="Region">
-        <Key>
-          <PropertyRef Name="RegionID" />
-        </Key>
-        <Property Name="RegionID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="RegionDescription" Type="Edm.String" Nullable="false" />
-        <NavigationProperty Name="Territories" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Territory)" />
-      </EntityType>
-      <EntityType Name="Shipper">
-        <Key>
-          <PropertyRef Name="ShipperID" />
-        </Key>
-        <Property Name="ShipperID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="CompanyName" Type="Edm.String" Nullable="false" />
-        <Property Name="Phone" Type="Edm.String" />
-        <NavigationProperty Name="Orders" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order)" />
-      </EntityType>
-      <EntityType Name="Supplier">
-        <Key>
-          <PropertyRef Name="SupplierID" />
-        </Key>
-        <Property Name="SupplierID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="CompanyName" Type="Edm.String" Nullable="false" />
-        <Property Name="ContactName" Type="Edm.String" />
-        <Property Name="ContactTitle" Type="Edm.String" />
-        <Property Name="Address" Type="Edm.String" />
-        <Property Name="City" Type="Edm.String" />
-        <Property Name="Region" Type="Edm.String" />
-        <Property Name="PostalCode" Type="Edm.String" />
-        <Property Name="CountryRegion" Type="Edm.String" />
-        <Property Name="Phone" Type="Edm.String" />
-        <Property Name="Fax" Type="Edm.String" />
-        <Property Name="HomePage" Type="Edm.String" />
-        <NavigationProperty Name="Products" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Product)" />
-      </EntityType>
-      <EntityType Name="Contact">
-        <Key>
-          <PropertyRef Name="ContactID" />
-        </Key>
-        <Property Name="ContactID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="ContactType" Type="Edm.String" />
-        <Property Name="CompanyName" Type="Edm.String" Nullable="false" />
-        <Property Name="ContactName" Type="Edm.String" />
-        <Property Name="ContactTitle" Type="Edm.String" />
-        <Property Name="Address" Type="Edm.String" />
-        <Property Name="City" Type="Edm.String" />
-        <Property Name="Region" Type="Edm.String" />
-        <Property Name="PostalCode" Type="Edm.String" />
-        <Property Name="CountryRegion" Type="Edm.String" />
-        <Property Name="Phone" Type="Edm.String" />
-        <Property Name="Extension" Type="Edm.String" />
-        <Property Name="Fax" Type="Edm.String" />
-        <Property Name="HomePage" Type="Edm.String" />
-        <Property Name="PhotoPath" Type="Edm.String" />
-        <Property Name="Photo" Type="Edm.Binary" />
-      </EntityType>
-      <Action Name="IncreasePrice" IsBound="true">
-        <Parameter Name="bindingParameter" Type="Microsoft.OData.Service.Sample.Northwind.Models.Product" />
-        <Parameter Name="diff" Type="Edm.Int32" Nullable="false" />
-      </Action>
-      <Action Name="ResetDataSource" />
-      <Function Name="MostExpensive" IsBound="true">
-        <Parameter Name="bindingParameter" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Product)" />
-        <ReturnType Type="Edm.Double" Nullable="false" />
-      </Function>
-      <EntityContainer Name="Container">
-        <EntitySet Name="Categories" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Category">
-          <NavigationPropertyBinding Path="Products" Target="Products" />
-        </EntitySet>
-        <EntitySet Name="Products" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Product">
-          <NavigationPropertyBinding Path="Category" Target="Categories" />
-          <NavigationPropertyBinding Path="Order_Details" Target="Order_Details" />
-          <NavigationPropertyBinding Path="Supplier" Target="Suppliers" />
-        </EntitySet>
-        <EntitySet Name="Order_Details" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail">
-          <NavigationPropertyBinding Path="Order" Target="Orders" />
-          <NavigationPropertyBinding Path="Product" Target="Products" />
-        </EntitySet>
-        <EntitySet Name="Orders" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Order">
-          <NavigationPropertyBinding Path="Customer" Target="Customers" />
-          <NavigationPropertyBinding Path="Employee" Target="Employees" />
-          <NavigationPropertyBinding Path="Order_Details" Target="Order_Details" />
-          <NavigationPropertyBinding Path="Shipper" Target="Shippers" />
-        </EntitySet>
-        <EntitySet Name="Customers" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Customer">
-          <NavigationPropertyBinding Path="Orders" Target="Orders" />
-          <NavigationPropertyBinding Path="CustomerDemographics" Target="CustomerDemographics" />
-        </EntitySet>
-        <EntitySet Name="CustomerDemographics" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.CustomerDemographic">
-          <NavigationPropertyBinding Path="Customers" Target="Customers" />
-        </EntitySet>
-        <EntitySet Name="Employees" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Employee">
-          <NavigationPropertyBinding Path="Employees1" Target="Employees" />
-          <NavigationPropertyBinding Path="Employee1" Target="Employees" />
-          <NavigationPropertyBinding Path="Orders" Target="Orders" />
-          <NavigationPropertyBinding Path="Territories" Target="Territories" />
-        </EntitySet>
-        <EntitySet Name="Territories" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Territory">
-          <NavigationPropertyBinding Path="Region" Target="Regions" />
-          <NavigationPropertyBinding Path="Employees" Target="Employees" />
-        </EntitySet>
-        <EntitySet Name="Regions" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Region">
-          <NavigationPropertyBinding Path="Territories" Target="Territories" />
-        </EntitySet>
-        <EntitySet Name="Shippers" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Shipper">
-          <NavigationPropertyBinding Path="Orders" Target="Orders" />
-        </EntitySet>
-        <EntitySet Name="Suppliers" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Supplier">
-          <NavigationPropertyBinding Path="Products" Target="Products" />
-        </EntitySet>
-        <EntitySet Name="Contacts" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Contact" />
-        <EntitySet Name="ExpensiveProducts" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Product">
-          <NavigationPropertyBinding Path="Category" Target="Categories" />
-          <NavigationPropertyBinding Path="Order_Details" Target="Order_Details" />
-          <NavigationPropertyBinding Path="Supplier" Target="Suppliers" />
-        </EntitySet>
-        <EntitySet Name="CurrentOrders" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Order">
-          <NavigationPropertyBinding Path="Customer" Target="Customers" />
-          <NavigationPropertyBinding Path="Employee" Target="Employees" />
-          <NavigationPropertyBinding Path="Order_Details" Target="Order_Details" />
-          <NavigationPropertyBinding Path="Shipper" Target="Shippers" />
-        </EntitySet>
-        <ActionImport Name="ResetDataSource" Action="Microsoft.OData.Service.Sample.Northwind.Models.ResetDataSource" />
-      </EntityContainer>
-    </Schema>
-  </edmx:DataServices>
-</edmx:Edmx>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"><edmx:DataServices><Schema Namespace="Microsoft.OData.Service.Sample.Northwind.Models" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityType Name="Category"><Key><PropertyRef Name="CategoryID" /></Key><Property Name="CategoryID" Type="Edm.Int32" Nullable="false" /><Property Name="CategoryName" Type="Edm.String" Nullable="false" /><Property Name="Description" Type="Edm.String" /><Property Name="Picture" Type="Edm.Binary" /><NavigationProperty Name="Products" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Product)" /></EntityType><EntityType Name="Product"><Key><PropertyRef Name="ProductID" /></Key><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductName" Type="Edm.String" Nullable="false" /><Property Name="SupplierID" Type="Edm.Int32" /><Property Name="CategoryID" Type="Edm.Int32" /><Property Name="QuantityPerUnit" Type="Edm.String" /><Property Name="UnitPrice" Type="Edm.Decimal" /><Property Name="UnitsInStock" Type="Edm.Int16" /><Property Name="UnitsOnOrder" Type="Edm.Int16" /><Property Name="ReorderLevel" Type="Edm.Int16" /><Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" /><NavigationProperty Name="Category" Type="Microsoft.OData.Service.Sample.Northwind.Models.Category"><ReferentialConstraint Property="CategoryID" ReferencedProperty="CategoryID" /></NavigationProperty><NavigationProperty Name="Order_Details" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail)" /><NavigationProperty Name="Supplier" Type="Microsoft.OData.Service.Sample.Northwind.Models.Supplier"><ReferentialConstraint Property="SupplierID" ReferencedProperty="SupplierID" /></NavigationProperty></EntityType><EntityType Name="Order_Detail"><Key><PropertyRef Name="OrderID" /><PropertyRef Name="ProductID" /></Key><Property Name="OrderID" Type="Edm.Int32" /><Property Name="ProductID" Type="Edm.Int32" /><Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" /><Property Name="Quantity" Type="Edm.Int16" Nullable="false" /><Property Name="Discount" Type="Edm.Single" Nullable="false" /><NavigationProperty Name="Order" Type="Microsoft.OData.Service.Sample.Northwind.Models.Order"><ReferentialConstraint Property="OrderID" ReferencedProperty="OrderID" /></NavigationProperty><NavigationProperty Name="Product" Type="Microsoft.OData.Service.Sample.Northwind.Models.Product"><ReferentialConstraint Property="ProductID" ReferencedProperty="ProductID" /></NavigationProperty></EntityType><EntityType Name="Order"><Key><PropertyRef Name="OrderID" /></Key><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="CustomerID" Type="Edm.String" /><Property Name="EmployeeID" Type="Edm.Int32" /><Property Name="OrderDate" Type="Edm.Date" /><Property Name="RequiredDate" Type="Edm.Date" /><Property Name="ShippedDate" Type="Edm.Date" /><Property Name="ShipVia" Type="Edm.Int32" /><Property Name="Freight" Type="Edm.Decimal" /><Property Name="ShipName" Type="Edm.String" /><Property Name="ShipAddress" Type="Edm.String" /><Property Name="ShipCity" Type="Edm.String" /><Property Name="ShipRegion" Type="Edm.String" /><Property Name="ShipPostalCode" Type="Edm.String" /><Property Name="ShipCountry" Type="Edm.String" /><NavigationProperty Name="Customer" Type="Microsoft.OData.Service.Sample.Northwind.Models.Customer"><ReferentialConstraint Property="CustomerID" ReferencedProperty="CustomerID" /></NavigationProperty><NavigationProperty Name="Employee" Type="Microsoft.OData.Service.Sample.Northwind.Models.Employee"><ReferentialConstraint Property="EmployeeID" ReferencedProperty="EmployeeID" /></NavigationProperty><NavigationProperty Name="Order_Details" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail)" /><NavigationProperty Name="Shipper" Type="Microsoft.OData.Service.Sample.Northwind.Models.Shipper" /></EntityType><EntityType Name="Customer"><Key><PropertyRef Name="CustomerID" /></Key><Property Name="CustomerID" Type="Edm.String" Nullable="false" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" /><Property Name="ContactName" Type="Edm.String" /><Property Name="ContactTitle" Type="Edm.String" /><Property Name="Address" Type="Edm.String" /><Property Name="City" Type="Edm.String" /><Property Name="Region" Type="Edm.String" /><Property Name="PostalCode" Type="Edm.String" /><Property Name="CountryRegion" Type="Edm.String" /><Property Name="Phone" Type="Edm.String" /><Property Name="Fax" Type="Edm.String" /><NavigationProperty Name="Orders" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order)" /><NavigationProperty Name="CustomerDemographics" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.CustomerDemographic)" /></EntityType><EntityType Name="CustomerDemographic"><Key><PropertyRef Name="CustomerTypeID" /></Key><Property Name="CustomerTypeID" Type="Edm.String" Nullable="false" /><Property Name="CustomerDesc" Type="Edm.String" /><NavigationProperty Name="Customers" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Customer)" /></EntityType><EntityType Name="Employee"><Key><PropertyRef Name="EmployeeID" /></Key><Property Name="EmployeeID" Type="Edm.Int32" /><Property Name="LastName" Type="Edm.String" Nullable="false" /><Property Name="FirstName" Type="Edm.String" Nullable="false" /><Property Name="Title" Type="Edm.String" /><Property Name="TitleOfCourtesy" Type="Edm.String" /><Property Name="BirthDate" Type="Edm.Date" /><Property Name="HireDate" Type="Edm.Date" /><Property Name="Address" Type="Edm.String" /><Property Name="City" Type="Edm.String" /><Property Name="Region" Type="Edm.String" /><Property Name="PostalCode" Type="Edm.String" /><Property Name="CountryRegion" Type="Edm.String" /><Property Name="HomePhone" Type="Edm.String" /><Property Name="Extension" Type="Edm.String" /><Property Name="Photo" Type="Edm.Binary" /><Property Name="Notes" Type="Edm.String" /><Property Name="ReportsTo" Type="Edm.Int32" /><Property Name="PhotoPath" Type="Edm.String" /><NavigationProperty Name="Employees1" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Employee)" /><NavigationProperty Name="Employee1" Type="Microsoft.OData.Service.Sample.Northwind.Models.Employee"><ReferentialConstraint Property="EmployeeID" ReferencedProperty="EmployeeID" /></NavigationProperty><NavigationProperty Name="Orders" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order)" /><NavigationProperty Name="Territories" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Territory)" /></EntityType><EntityType Name="Territory"><Key><PropertyRef Name="TerritoryID" /></Key><Property Name="TerritoryID" Type="Edm.String" Nullable="false" /><Property Name="TerritoryDescription" Type="Edm.String" Nullable="false" /><Property Name="RegionID" Type="Edm.Int32" /><NavigationProperty Name="Region" Type="Microsoft.OData.Service.Sample.Northwind.Models.Region"><ReferentialConstraint Property="RegionID" ReferencedProperty="RegionID" /></NavigationProperty><NavigationProperty Name="Employees" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Employee)" /></EntityType><EntityType Name="Region"><Key><PropertyRef Name="RegionID" /></Key><Property Name="RegionID" Type="Edm.Int32" Nullable="false" /><Property Name="RegionDescription" Type="Edm.String" Nullable="false" /><NavigationProperty Name="Territories" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Territory)" /></EntityType><EntityType Name="Shipper"><Key><PropertyRef Name="ShipperID" /></Key><Property Name="ShipperID" Type="Edm.Int32" Nullable="false" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" /><Property Name="Phone" Type="Edm.String" /><NavigationProperty Name="Orders" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Order)" /></EntityType><EntityType Name="Supplier"><Key><PropertyRef Name="SupplierID" /></Key><Property Name="SupplierID" Type="Edm.Int32" Nullable="false" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" /><Property Name="ContactName" Type="Edm.String" /><Property Name="ContactTitle" Type="Edm.String" /><Property Name="Address" Type="Edm.String" /><Property Name="City" Type="Edm.String" /><Property Name="Region" Type="Edm.String" /><Property Name="PostalCode" Type="Edm.String" /><Property Name="CountryRegion" Type="Edm.String" /><Property Name="Phone" Type="Edm.String" /><Property Name="Fax" Type="Edm.String" /><Property Name="HomePage" Type="Edm.String" /><NavigationProperty Name="Products" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Product)" /></EntityType><EntityType Name="Contact"><Key><PropertyRef Name="ContactID" /></Key><Property Name="ContactID" Type="Edm.Int32" Nullable="false" /><Property Name="ContactType" Type="Edm.String" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" /><Property Name="ContactName" Type="Edm.String" /><Property Name="ContactTitle" Type="Edm.String" /><Property Name="Address" Type="Edm.String" /><Property Name="City" Type="Edm.String" /><Property Name="Region" Type="Edm.String" /><Property Name="PostalCode" Type="Edm.String" /><Property Name="CountryRegion" Type="Edm.String" /><Property Name="Phone" Type="Edm.String" /><Property Name="Extension" Type="Edm.String" /><Property Name="Fax" Type="Edm.String" /><Property Name="HomePage" Type="Edm.String" /><Property Name="PhotoPath" Type="Edm.String" /><Property Name="Photo" Type="Edm.Binary" /></EntityType><Action Name="IncreasePrice" IsBound="true"><Parameter Name="bindingParameter" Type="Microsoft.OData.Service.Sample.Northwind.Models.Product" /><Parameter Name="diff" Type="Edm.Int32" Nullable="false" /></Action><Action Name="ResetDataSource" /><Function Name="MostExpensive" IsBound="true"><Parameter Name="bindingParameter" Type="Collection(Microsoft.OData.Service.Sample.Northwind.Models.Product)" /><ReturnType Type="Edm.Double" Nullable="false" /></Function><EntityContainer Name="Container"><EntitySet Name="Categories" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Category"><NavigationPropertyBinding Path="Products" Target="Products" /></EntitySet><EntitySet Name="Products" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Product"><NavigationPropertyBinding Path="Category" Target="Categories" /><NavigationPropertyBinding Path="Order_Details" Target="Order_Details" /><NavigationPropertyBinding Path="Supplier" Target="Suppliers" /></EntitySet><EntitySet Name="Order_Details" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Order_Detail"><NavigationPropertyBinding Path="Order" Target="Orders" /><NavigationPropertyBinding Path="Product" Target="Products" /></EntitySet><EntitySet Name="Orders" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Order"><NavigationPropertyBinding Path="Customer" Target="Customers" /><NavigationPropertyBinding Path="Employee" Target="Employees" /><NavigationPropertyBinding Path="Order_Details" Target="Order_Details" /><NavigationPropertyBinding Path="Shipper" Target="Shippers" /></EntitySet><EntitySet Name="Customers" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Customer"><NavigationPropertyBinding Path="Orders" Target="Orders" /><NavigationPropertyBinding Path="CustomerDemographics" Target="CustomerDemographics" /></EntitySet><EntitySet Name="CustomerDemographics" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.CustomerDemographic"><NavigationPropertyBinding Path="Customers" Target="Customers" /></EntitySet><EntitySet Name="Employees" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Employee"><NavigationPropertyBinding Path="Employees1" Target="Employees" /><NavigationPropertyBinding Path="Employee1" Target="Employees" /><NavigationPropertyBinding Path="Orders" Target="Orders" /><NavigationPropertyBinding Path="Territories" Target="Territories" /></EntitySet><EntitySet Name="Territories" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Territory"><NavigationPropertyBinding Path="Region" Target="Regions" /><NavigationPropertyBinding Path="Employees" Target="Employees" /></EntitySet><EntitySet Name="Regions" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Region"><NavigationPropertyBinding Path="Territories" Target="Territories" /></EntitySet><EntitySet Name="Shippers" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Shipper"><NavigationPropertyBinding Path="Orders" Target="Orders" /></EntitySet><EntitySet Name="Suppliers" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Supplier"><NavigationPropertyBinding Path="Products" Target="Products" /></EntitySet><EntitySet Name="Contacts" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Contact" /><EntitySet Name="ExpensiveProducts" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Product"><NavigationPropertyBinding Path="Category" Target="Categories" /><NavigationPropertyBinding Path="Order_Details" Target="Order_Details" /><NavigationPropertyBinding Path="Supplier" Target="Suppliers" /></EntitySet><EntitySet Name="CurrentOrders" EntityType="Microsoft.OData.Service.Sample.Northwind.Models.Order"><NavigationPropertyBinding Path="Customer" Target="Customers" /><NavigationPropertyBinding Path="Employee" Target="Employees" /><NavigationPropertyBinding Path="Order_Details" Target="Order_Details" /><NavigationPropertyBinding Path="Shipper" Target="Shippers" /></EntitySet><ActionImport Name="ResetDataSource" Action="Microsoft.OData.Service.Sample.Northwind.Models.ResetDataSource" /></EntityContainer></Schema></edmx:DataServices></edmx:Edmx>
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand1.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand1.txt
index 112eadef..a0a7d673 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand1.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand1.txt
@@ -1,57 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand2.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand2.txt
index 03e88053..6cff2342 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand2.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand2.txt
@@ -1,57 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand3.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand3.txt
index 8586fed0..2cca3522 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand3.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand3.txt
@@ -1,29 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand4.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand4.txt
index 22a52746..c72407ce 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand4.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand4.txt
@@ -1,29 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand5.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand5.txt
index b54a35a7..4f5c2566 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand5.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastExpand5.txt
@@ -1,127 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ],"PeerSeniorStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"HighEndConferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        }
-      ],"PeerSeniorStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"HighEndConferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ],"Conferences":[
-        
-      ],"PeerSeniorStaffs":[
-        
-      ],"HighEndConferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000}],"PeerSeniorStaffs":[{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"HighEndConferences":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000}],"PeerSeniorStaffs":[{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"HighEndConferences":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[],"Conferences":[],"PeerSeniorStaffs":[],"HighEndConferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath1.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath1.txt
index 0a046701..33f4d26f 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath1.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath1.txt
@@ -1,33 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[
-    {
-      "StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath2.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath2.txt
index 5f0b5600..8a255b9f 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath2.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath2.txt
@@ -1,33 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[
-    {
-      "StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath3.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath3.txt
index a5328282..088e1c6e 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath3.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath3.txt
@@ -1,25 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[
-    {
-      "StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath4.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath4.txt
index d2e096a5..6f41b759 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath4.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath4.txt
@@ -1,25 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[
-    {
-      "StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath5.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath5.txt
index d80931fa..2935c573 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath5.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath5.txt
@@ -1,83 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[
-    {
-      "StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ],"PeerSeniorStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"HighEndConferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ],"PeerSeniorStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"HighEndConferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ],"Conferences":[
-        
-      ],"PeerSeniorStaffs":[
-        
-      ],"HighEndConferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}],"PeerSeniorStaffs":[{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"HighEndConferences":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}],"PeerSeniorStaffs":[{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"HighEndConferences":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[],"Conferences":[],"PeerSeniorStaffs":[],"HighEndConferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath6.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath6.txt
index bc54f545..bb43bb16 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath6.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPath6.txt
@@ -1,41 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences/Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","value":[
-    {
-      "ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ],"GlodSponsors":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    },{
-      "ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ],"GlodSponsors":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences/Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","value":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}],"GlodSponsors":[{"SponsorId":6,"Name":"sponsor5","Funding":100},{"SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}],"GlodSponsors":[{"SponsorId":6,"Name":"sponsor5","Funding":100},{"SponsorId":8,"Name":"sponsor7","Funding":10000}]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand1.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand1.txt
index 25665a9e..3271f8e9 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand1.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand1.txt
@@ -1,45 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand2.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand2.txt
index 06c9bc49..18731b0e 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand2.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand2.txt
@@ -1,45 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand3.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand3.txt
index b64e4a4b..956fa74b 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand3.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand3.txt
@@ -1,21 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[
-    {
-      "StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand4.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand4.txt
index 1cb481c9..a9c381f3 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand4.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand4.txt
@@ -1,21 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[
-    {
-      "StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand5.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand5.txt
index 9fb76508..a481d64a 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand5.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand5.txt
@@ -1,17 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[
-    {
-      "StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerSeniorStaffs":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand6.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand6.txt
index bf51c734..79fc5bc4 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand6.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand6.txt
@@ -1,17 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[
-    {
-      "StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"HighEndConferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand7.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand7.txt
index 19c36fb0..6ac77b09 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand7.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand7.txt
@@ -1,53 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences","value":[
-    {
-      "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    },{
-      "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences","value":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand8.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand8.txt
index a8b99635..a72ac78f 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand8.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand8.txt
@@ -1,29 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences/Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","value":[
-    {
-      "ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    },{
-      "ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences/Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","value":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand9.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand9.txt
index fd25d65c..d62e6ad9 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand9.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterCastPropExpand9.txt
@@ -1,21 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences/Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","value":[
-    {
-      "ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"GlodSponsors":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    },{
-      "ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"GlodSponsors":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences/Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","value":[{"ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"GlodSponsors":[{"SponsorId":6,"Name":"sponsor5","Funding":100},{"SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"GlodSponsors":[{"SponsorId":6,"Name":"sponsor5","Funding":100},{"SponsorId":8,"Name":"sponsor7","Funding":10000}]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand1.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand1.txt
index cf35e889..01679a4b 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand1.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand1.txt
@@ -1,45 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand2.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand2.txt
index b816360a..7cfc7f43 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand2.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand2.txt
@@ -1,45 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand3.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand3.txt
index 26f28d91..0769385a 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand3.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand3.txt
@@ -1,77 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ],"Conferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[],"Conferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand4.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand4.txt
index 19c36fb0..6ac77b09 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand4.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterPathExpand4.txt
@@ -1,53 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences","value":[
-    {
-      "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    },{
-      "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-        {
-          "SponsorId":2,"Name":"sponsor1"
-        },{
-          "SponsorId":4,"Name":"sponsor3"
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences","value":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption3.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption3.txt
index 69e77777..220c2aa0 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption3.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption3.txt
@@ -1,5 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption4.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption4.txt
index 20aa4aa1..aea96802 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption4.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption4.txt
@@ -1,41 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption5.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption5.txt
index 69e77777..220c2aa0 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption5.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption5.txt
@@ -1,5 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption6.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption6.txt
index 9d6e833f..d915a6a8 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption6.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnFilterQueryOption6.txt
@@ -1,53 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterNestedExpand1.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterNestedExpand1.txt
index 1327499c..1ee336aa 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterNestedExpand1.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterNestedExpand1.txt
@@ -1,185 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-            
-          ]
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-            
-          ]
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-            
-          ]
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-            {
-              "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-            },{
-              "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-            
-          ]
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterNestedExpand2.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterNestedExpand2.txt
index 66e0babf..0e75c8d5 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterNestedExpand2.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterNestedExpand2.txt
@@ -1,217 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[
-            {
-              "SponsorId":2,"Name":"sponsor1"
-            },{
-              "SponsorId":4,"Name":"sponsor3"
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100
-            },{
-              "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000
-            }
-          ]
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000,"Sponsors":[{"SponsorId":2,"Name":"sponsor1"},{"SponsorId":4,"Name":"sponsor3"},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":6,"Name":"sponsor5","Funding":100},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.GlodSponsor","SponsorId":8,"Name":"sponsor7","Funding":10000}]}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg1.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg1.txt
index 8fdcf05e..f6a095ad 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg1.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg1.txt
@@ -1,15 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg3.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg3.txt
index 521cb225..69303e13 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg3.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg3.txt
@@ -1,3 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/$entity","StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/$entity","StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg4.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg4.txt
index d6a78e77..a69be676 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg4.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg4.txt
@@ -1,13 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg5.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg5.txt
index 6dad6ca4..6855bcdc 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg5.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg5.txt
@@ -1,13 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences","value":[
-    {
-      "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-    },{
-      "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Conferences","value":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg6.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg6.txt
index 2e57947e..47710a73 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg6.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterPathSeg6.txt
@@ -1,11 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[
-    {
-      "StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-    },{
-      "StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-    },{
-      "StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs/Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","value":[{"StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand1.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand1.txt
index 112eadef..a0a7d673 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand1.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand1.txt
@@ -1,57 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand2.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand2.txt
index 03e88053..6cff2342 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand2.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand2.txt
@@ -1,57 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"Conferences":[]}]}
\ No newline at end of file
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand3.txt b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand3.txt
index 1586015c..879ef733 100644
--- a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand3.txt
+++ b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/Baselines/OnfilterSimpleExpand3.txt
@@ -1,99 +1 @@
-{
-  "@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[
-    {
-      "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[
-        {
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        {
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null
-        },{
-          "StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0
-        },{
-          "StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0
-        }
-      ],"Conferences":[
-        {
-          "ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000
-        },{
-          "ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000
-        },{
-          "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000
-        }
-      ]
-    },{
-      "@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[
-        
-      ],"Conferences":[
-        
-      ]
-    }
-  ]
-}
\ No newline at end of file
+{"@odata.context":"http://localhost:18384/api/Trippin/$metadata#Staffs","value":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0,"PeerStaffs":[{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0,"PeerStaffs":[{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":8,"UserName":"keithpinckney","FirstName":"Keith","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":6,"UserName":"vincentcalabrese","FirstName":"Vincent","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null},{"StaffId":4,"UserName":"javieralfred","FirstName":"Javier","YearOfService":0},{"StaffId":2,"UserName":"scottketchum","FirstName":"Scott","YearOfService":0}],"Conferences":[{"ConferenceId":2,"Name":"conference1","NumberOfAttendees":2000},{"ConferenceId":4,"Name":"conference3","NumberOfAttendees":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":6,"Name":"conference5","NumberOfAttendees":1000,"NumberofVips":1000},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.HighEndConference","ConferenceId":8,"Name":"conference7","NumberOfAttendees":1000,"NumberofVips":1000}]},{"@odata.type":"#Microsoft.OData.Service.Sample.Trippin.Models.SeniorStaff","StaffId":10,"UserName":"Rains","FirstName":"Layla","YearOfService":0,"SeniorLevel":0,"SeniorTitle":null,"PeerStaffs":[],"Conferences":[]}]}
\ No newline at end of file