diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index c40d525e..fd5b4e09 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -39,9 +39,15 @@ jobs:
       if: ${{ runner.os == 'Windows' }}
 
       ## Only difference here is not forcing cmd
-    - name: Build and test (!win)
+    - name: Build and test (ubuntu & macos)
       run: ./build ci
       if: ${{ runner.os != 'Windows' }}
 
+    - name: Test - Persistence
+      run: dotnet bin/Debug/Persistence.Tests/Persistence.Tests.dll
+
+    - name: Test - PAModel
+      run: dotnet bin/Debug/PAModelTests/PAModelTests.dll
+
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0c4ca1f0..b74cd68f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -40,19 +40,29 @@ jobs:
   - task: CodeQL3000Init@0
 
   - task: DotNetCoreCLI@2
-    displayName: 'Build and test '
+    displayName: 'Build'
     inputs:
       command: 'run'
       projects: '$(Build.SourcesDirectory)/targets/targets.csproj'
       arguments: '-- ci -c $(BuildConfiguration)'
 
+  - task: DotNetCoreCLI@2
+    displayName: 'Test Persistence'
+    inputs:
+      command: '$(Build.SourcesDirectory)/bin/$(BuildConfiguration)/Persistence.Tests/Persistence.Tests.dll'
+
+  - task: DotNetCoreCLI@2
+    displayName: 'Test PAModel'
+    inputs:
+      command: '$(Build.SourcesDirectory)/bin/$(BuildConfiguration)/PAModelTests/PAModelTests.dll'
+
   - task: CodeQL3000Finalize@0
 
   - task: PublishTestResults@2
     inputs:
       testResultsFormat: 'VSTest'
       testResultsFiles: '**/*-*.trx'
-      searchFolder: '$(Build.SourcesDirectory)/obj/'
+      searchFolder: '$(Build.SourcesDirectory)/'
       mergeTestResults: true
       failTaskOnFailedTests: true
 
diff --git a/src/PAModelTests/PAModelTests.csproj b/src/PAModelTests/PAModelTests.csproj
index b9525695..e060d228 100644
--- a/src/PAModelTests/PAModelTests.csproj
+++ b/src/PAModelTests/PAModelTests.csproj
@@ -5,14 +5,15 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <PublicSign>true</PublicSign>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
+    <PackageReference Include="MSTest" Version="$(MSTest)" />
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
     <PackageReference Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
   </ItemGroup>
diff --git a/src/Persistence.Tests/Persistence.Tests.csproj b/src/Persistence.Tests/Persistence.Tests.csproj
index 494e525e..78360dbe 100644
--- a/src/Persistence.Tests/Persistence.Tests.csproj
+++ b/src/Persistence.Tests/Persistence.Tests.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-
+        <EnableMSTestRunner>true</EnableMSTestRunner>
+        <OutputType>Exe</OutputType>
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
         <SignAssembly>false</SignAssembly>
@@ -17,9 +18,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
         <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
-        <PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
+        <PackageReference Include="MSTest" Version="$(MSTest)" />
         <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
         <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     </ItemGroup>
diff --git a/src/Persistence.Tests/Yaml/DeserializerValidTests.cs b/src/Persistence.Tests/Yaml/DeserializerValidTests.cs
index f1fde363..05cb514d 100644
--- a/src/Persistence.Tests/Yaml/DeserializerValidTests.cs
+++ b/src/Persistence.Tests/Yaml/DeserializerValidTests.cs
@@ -157,7 +157,7 @@ public void Deserialize_ShouldParseBuiltInControlFromYamlCustomControl()
     }
 
     [TestMethod]
-    [DataRow(@"_TestData/ValidYaml/Screen-with-controls.fx.yaml", "Screen 1", 2, 2)]
+    [DataRow(@"_TestData/ValidYaml/Screen-with-controls.fx.yaml", "Screen 1", 2000, 2)]
     [DataRow(@"_TestData/ValidYaml/Screen-with-name.fx.yaml", "My Power Apps Screen", 0, 0)]
     [DataRow(@"_TestData/ValidYaml/Control-with-custom-template.yaml", "My Power Apps Custom Control", 0, 9)]
     public void Deserialize_ShouldSucceed(string path, string expectedName, int controlCount, int propertiesCount)
diff --git a/src/Versions.props b/src/Versions.props
index ad84c3d2..5bbeaf71 100644
--- a/src/Versions.props
+++ b/src/Versions.props
@@ -3,8 +3,9 @@
         <TargetFrameworkVersion>net7.0</TargetFrameworkVersion>
         <YamlDotNetVersion>15.1.0</YamlDotNetVersion>
         <MicrosoftNETTestSdkVersion>17.7.1</MicrosoftNETTestSdkVersion>
-        <MSTestTestAdapterVersion>2.2.10</MSTestTestAdapterVersion>
-        <MSTestTestFrameworkVersion>2.2.10</MSTestTestFrameworkVersion>
+        <MSTestTestAdapterVersion>3.2.0</MSTestTestAdapterVersion>
+        <MSTestTestFrameworkVersion>3.2.0</MSTestTestFrameworkVersion>
+        <MSTest>3.2.0</MSTest>
         <CoverletCollectorVersion>3.2.0</CoverletCollectorVersion>
         <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
         <MinVerVersion>4.3.0</MinVerVersion>
diff --git a/targets/Program.cs b/targets/Program.cs
index 1ce0fda8..908ab691 100644
--- a/targets/Program.cs
+++ b/targets/Program.cs
@@ -52,7 +52,6 @@ static void Main(string[] args)
             string SrcDir = Path.Combine(RootDir, "src");
 
             string LogDir = Path.Combine(ObjDir, "logs");
-            string TestLogDir = Path.Combine(ObjDir, "testLogs");
 
             string PAModelDir = Path.Combine(SrcDir, "PAModel");
             var solution = Path.Combine(SrcDir, "PASopa.sln");
@@ -82,9 +81,6 @@ static void Main(string[] args)
                     RunDotnet("build", $"{EscapePath(solution)} --configuration {options.Configuration} --no-restore", gitExists, LogDir);
                 });
 
-            Target("test",
-                () => RunDotnet("test", $"{EscapePath(solution)} --configuration {options.Configuration} --no-build --logger trx --results-directory {EscapePath(TestLogDir)}", gitExists, LogDir));
-
             Target("rebuild",
                 DependsOn("restore", "build"));
 
@@ -98,7 +94,7 @@ static void Main(string[] args)
                 });
 
             Target("ci",
-                DependsOn("squeaky-clean", "rebuild", "test"));
+                DependsOn("squeaky-clean", "rebuild"));
 
             Parser.Default.ParseArguments<Options>(args)
             .WithParsed<Options>(o =>