diff --git a/Tests/NFUnitTestAdpater/packages.config b/Tests/NFUnitTestAdpater/packages.config
deleted file mode 100644
index 7e0e1e84..00000000
--- a/Tests/NFUnitTestAdpater/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="nanoFramework.CoreLibrary" version="1.10.1-preview.11" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.TestFramework" version="1.0.92" targetFramework="netnanoframework10" developmentDependency="true" />
-</packages>
\ No newline at end of file
diff --git a/Tests/NFUnitTestAdpater/DummyClass.cs b/Tests/NFUnitTest_DummyAdapter/DummyClass.cs
similarity index 100%
rename from Tests/NFUnitTestAdpater/DummyClass.cs
rename to Tests/NFUnitTest_DummyAdapter/DummyClass.cs
diff --git a/Tests/NFUnitTestAdpater/NFUnitTestAdapater.nfproj b/Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj
similarity index 86%
rename from Tests/NFUnitTestAdpater/NFUnitTestAdapater.nfproj
rename to Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj
index a110c6a6..8424376f 100644
--- a/Tests/NFUnitTestAdpater/NFUnitTestAdapater.nfproj
+++ b/Tests/NFUnitTest_DummyAdapter/NFUnitTest_DummyAdapter.nfproj
@@ -31,29 +31,29 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="mscorlib, Version=1.10.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.CoreLibrary.1.10.1-preview.11\lib\mscorlib.dll</HintPath>
+    <None Include="nano.runsettings" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib, Version=1.10.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\..\packages\nanoFramework.CoreLibrary.1.10.3-preview.7\lib\mscorlib.dll</HintPath>
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
     </Reference>
-    <Reference Include="nanoFramework.TestFramework, Version=1.0.92.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.1.0.92\lib\nanoFramework.TestFramework.dll</HintPath>
+    <Reference Include="nanoFramework.TestFramework, Version=1.0.98.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\..\packages\nanoFramework.TestFramework.1.0.98\lib\nanoFramework.TestFramework.dll</HintPath>
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
     </Reference>
     <Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.1.0.92\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
+      <HintPath>..\..\packages\nanoFramework.TestFramework.1.0.98\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="nano.runsettings" />
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
   <!-- MANUAL UPDATE HERE -->
-  <Import Project="..\..\packages\nanoFramework.TestFramework.1.0.92\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.92\build\nanoFramework.TestFramework.targets')" />
+  <Import Project="..\..\packages\nanoFramework.TestFramework.1.0.98\build\nanoFramework.TestFramework.targets" Condition="Exists('..\..\packages\nanoFramework.TestFramework.1.0.98\build\nanoFramework.TestFramework.targets')" />
   <ProjectExtensions>
     <ProjectCapabilities>
       <ProjectConfigurationsDeclaredAsItems />
@@ -63,6 +63,6 @@
     <PropertyGroup>
       <WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
     </PropertyGroup>
-    <Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.92\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
+    <Warning Condition="!Exists('..\..\packages\nanoFramework.TestFramework.1.0.98\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Tests/NFUnitTestAdpater/Properties/AssemblyInfo.cs b/Tests/NFUnitTest_DummyAdapter/Properties/AssemblyInfo.cs
similarity index 100%
rename from Tests/NFUnitTestAdpater/Properties/AssemblyInfo.cs
rename to Tests/NFUnitTest_DummyAdapter/Properties/AssemblyInfo.cs
diff --git a/Tests/NFUnitTestAdpater/nano.runsettings b/Tests/NFUnitTest_DummyAdapter/nano.runsettings
similarity index 100%
rename from Tests/NFUnitTestAdpater/nano.runsettings
rename to Tests/NFUnitTest_DummyAdapter/nano.runsettings
diff --git a/Tests/NFUnitTest_DummyAdapter/packages.config b/Tests/NFUnitTest_DummyAdapter/packages.config
new file mode 100644
index 00000000..5364f4bf
--- /dev/null
+++ b/Tests/NFUnitTest_DummyAdapter/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="nanoFramework.CoreLibrary" version="1.10.3-preview.7" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.TestFramework" version="1.0.98" targetFramework="netnanoframework10" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f84e9fcb..6adf9a67 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -41,7 +41,7 @@ jobs:
     parameters:
       sonarCloudProject: 'nanoframework_lib-CoreLibrary'
       runUnitTests: true
-      unitTestRunsettings: '$(System.DefaultWorkingDirectory)\Tests\NFUnitTestAdpater\nano.runsettings'
+      unitTestRunsettings: '$(System.DefaultWorkingDirectory)\Tests\NFUnitTest_DummyAdapter\nano.runsettings'
 
   # package steps
   - template: azure-pipelines-templates/class-lib-package.yml@templates  
diff --git a/nanoFramework.CoreLibrary.sln b/nanoFramework.CoreLibrary.sln
index 0f93e422..ff188880 100644
--- a/nanoFramework.CoreLibrary.sln
+++ b/nanoFramework.CoreLibrary.sln
@@ -62,7 +62,7 @@ Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "TestFramework", "Tests\Test
 EndProject
 Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "TestFrameworkShared", "nanoFramework.TestFramework\source\TestFrameworkShared\TestFrameworkShared.shproj", "{55F048B5-6739-43C5-A93D-DB61DB8E912F}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFUnitTestAdapater", "Tests\NFUnitTestAdpater\NFUnitTestAdapater.nfproj", "{396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}"
+Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "NFUnitTest_DummyAdapter", "Tests\NFUnitTest_DummyAdapter\NFUnitTest_DummyAdapter.nfproj", "{396A2B21-8A5F-4274-9FDD-3B35DC8EAE47}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
diff --git a/nanoFramework.TestFramework b/nanoFramework.TestFramework
index 56156e46..53619c38 160000
--- a/nanoFramework.TestFramework
+++ b/nanoFramework.TestFramework
@@ -1 +1 @@
-Subproject commit 56156e464c2b2b7bf717e4ae5f372c7aedc08812
+Subproject commit 53619c38bf6ec0e87b8bd19c71b9ab3fddc7d083