diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj
index b59eeaa71..9cbd12d1a 100644
--- a/src/Test/Test.csproj
+++ b/src/Test/Test.csproj
@@ -1,214 +1,209 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
-    <PropertyGroup>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <AssemblyName>Test</AssemblyName>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <FileAlignment>512</FileAlignment>
-        <OutputType>Library</OutputType>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}</ProjectGuid>
-        <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-        <RootNamespace>Test</RootNamespace>
-        <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-        <RuntimeIdentifier>win</RuntimeIdentifier>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <WarningLevel>4</WarningLevel>
-        <Prefer32Bit>false</Prefer32Bit>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-        <DebugType>pdbonly</DebugType>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <WarningLevel>4</WarningLevel>
-        <Prefer32Bit>false</Prefer32Bit>
-    </PropertyGroup>
-    <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <Private>False</Private>
-        </Reference>
-        <Reference Include="System"/>
-        <Reference Include="System.Configuration"/>
-        <Reference Include="System.Drawing"/>
-        <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Windows.Forms"/>
-        <Reference Include="System.Xml"/>
-        <Reference Include="System.Xml.Linq"/>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="Assa\TagHelperRemoveTagTest.cs"/>
-        <Compile Include="Assa\ResamplerTest.cs"/>
-        <Compile Include="Assa\AssaTimeCodes.cs"/>
-        <Compile Include="Core\AudioToTextTest.cs"/>
-        <Compile Include="Core\JsonTest.cs"/>
-        <Compile Include="Core\MergeShortLinesUtilsTest.cs"/>
-        <Compile Include="Core\CsvUtilTest.cs"/>
-        <Compile Include="Core\WebVttHelperTest.cs"/>
-        <Compile Include="Core\WebVttToAssaTest.cs"/>
-        <Compile Include="Dictionaries\StringWithoutSpaceSplitToWordsTest.cs"/>
-        <Compile Include="GoogleCloudVision\GoogleCloudVisionJsonToLinesTest.cs"/>
-        <Compile Include="LanguageFiles\LanguageFileTest.cs"/>
-        <Compile Include="Logic\AutoTranslate\MergeAndSplitHelperTest.cs"/>
-        <Compile Include="Logic\BeautifyTimeCodesTest.cs"/>
-        <Compile Include="Logic\ConvertColorsToDialogTest.cs"/>
-        <Compile Include="Core\LanguageAutoDetectLanguagesTest.cs"/>
-        <Compile Include="Logic\DimensionTest.cs"/>
-        <Compile Include="Logic\NetflixHelperTest.cs"/>
-        <Compile Include="Logic\SubtitleFormats\EbuStlTest.cs"/>
-        <Compile Include="Logic\SubtitleFormats\NetflixTimedTextTest.cs"/>
-        <Compile Include="Logic\SubtitleFormats\LrcTest.cs"/>
-        <Compile Include="Logic\SubtitleFormats\PacTest.cs"/>
-        <Compile Include="Core\UUEncodingTest.cs"/>
-        <Compile Include="Core\CharUtilsTest.cs"/>
-        <Compile Include="Core\DialogTypeTest.cs"/>
-        <Compile Include="Core\SeJsonParserTest.cs"/>
-        <Compile Include="Core\FixCasingTest.cs"/>
-        <Compile Include="Core\LanguageAutoDetectTest.cs"/>
-        <Compile Include="Core\PlainTextImporterTest.cs"/>
-        <Compile Include="Core\StringExtensionsTest.cs"/>
-        <Compile Include="Core\NikseBitmapTest.cs"/>
-        <Compile Include="Core\SubtitleFormatTest.cs"/>
-        <Compile Include="Core\SubtitleTest.cs"/>
-        <Compile Include="Core\RichTextToPlainTextTest.cs"/>
-        <Compile Include="Logic\BridgeGapsTest.cs"/>
-        <Compile Include="Logic\Forms\MoveWordUpDownTest.cs"/>
-        <Compile Include="Logic\NetflixQualityCheckTest.cs"/>
-        <Compile Include="Logic\Ocr\BinaryOcrTest.cs"/>
-        <Compile Include="Core\HtmlUtilTest.cs"/>
-        <Compile Include="FixCommonErrors\FixCommonErrorsTest.cs"/>
-        <Compile Include="Logic\LanguageTest.cs"/>
-        <Compile Include="Logic\BluRaySup\BluRaySupParserTest.cs"/>
-        <Compile Include="Logic\BluRaySup\ToolBoxTest.cs"/>
-        <Compile Include="Logic\Dictionaries\NamesListTest.cs"/>
-        <Compile Include="Logic\Dictionaries\OcrFixReplaceListTest.cs"/>
-        <Compile Include="Logic\Mp4\Mp4Test.cs"/>
-        <Compile Include="Logic\Ocr\MatchesToItalicStringConverterTest.cs"/>
-        <Compile Include="Logic\SplitLongLinesHelperTest.cs"/>
-        <Compile Include="Logic\SubtitleFormats\Cea708Test.cs"/>
-        <Compile Include="Logic\SubtitleFormats\SubtitleFormatFunctionsTest.cs"/>
-        <Compile Include="Logic\TarFileTest.cs"/>
-        <Compile Include="Logic\ProgressHelperTest.cs"/>
-        <Compile Include="Logic\TransportStream\TransportStreamTest.cs"/>
-        <Compile Include="Logic\ParagraphTest.cs"/>
-        <Compile Include="Logic\StrippableTextTest.cs"/>
-        <Compile Include="Logic\TimeCodeTest.cs"/>
-        <Compile Include="Logic\UknownFormatImporterJsonTest.cs"/>
-        <Compile Include="Logic\ContinuationUtilitiesTest.cs"/>
-        <Compile Include="Logic\HtmlUtilTest.cs"/>
-        <Compile Include="Logic\VideoFormats\MatroskaTest.cs"/>
-        <Compile Include="Logic\VobSub\VobSubTest.cs"/>
-        <Compile Include="Logic\Ocr\NOcrTest.cs"/>
-        <Compile Include="Properties\AssemblyInfo.cs"/>
-        <Compile Include="Logic\Forms\RemoveTextForHearImpairedTest.cs"/>
-        <Compile Include="Logic\SubtitleFormats\SubtitleFormatsTest.cs"/>
-        <Compile Include="Logic\UtilitiesTest.cs"/>
-        <Compile Include="Dictionaries\XmlDictionariesTest.cs"/>
-        <Compile Include="UserControls\NikseComboBoxTests.cs"/>
-        <Compile Include="UserControls\SeTextBoxTests.cs"/>
-    </ItemGroup>
-    <ItemGroup>
-        <EmbeddedResource Include="Dictionaries\en_US.aff"/>
-        <EmbeddedResource Include="Dictionaries\en_US.dic"/>
-    </ItemGroup>
-    <ItemGroup>
-        <EmbeddedResource Include="Dictionaries\names.xml"/>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Files\sample.tar">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Files\sample_MKV_delayed.mkv">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-        <Content Include="Files\sample_MKV_SRT.mkv">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-        <Content Include="Files\sample_MKV_VobSub_PGS.mkv">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-        <Content Include="Files\sample_MP4.mp4">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-        <Content Include="Files\sample_TS_with_graphics.ts">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Files\sample_MP4_SRT.mp4">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Files\sample_BDSUP_multi_image.sup">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Files\auto_detect_Danish.srt">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Files\auto_detect_Russian.srt">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Files\auto_detect_windows-1250.srt">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-        <Content Include="Files\auto_detect_windows-1251.srt">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Files\sample_TS_with_teletext.ts">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-    <ItemGroup>
-        <None Include="app.config"/>
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\libse\LibSE.csproj">
-            <Project>{d6f64cd3-c3ea-4b36-b575-9b3b8a3ca13f}</Project>
-            <Name>LibSE</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\ui\SubtitleEdit.csproj">
-            <Project>{511a5b59-1c35-4719-8536-23b19af9b21a}</Project>
-            <Name>SubtitleEdit</Name>
-        </ProjectReference>
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="NHunspell"/>
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe"/>
-        <PackageReference Include="System.Threading.Tasks.Extensions"/>
-    </ItemGroup>
-    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets"/>
-    <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')"/>
-    
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>Test</AssemblyName>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <FileAlignment>512</FileAlignment>
+    <OutputType>Library</OutputType>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}</ProjectGuid>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <RootNamespace>Test</RootNamespace>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <RuntimeIdentifier>win</RuntimeIdentifier>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DebugType>pdbonly</DebugType>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http.Extensions" />
+    <Reference Include="System.Net.Http.Primitives" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Assa\TagHelperRemoveTagTest.cs" />
+    <Compile Include="Assa\ResamplerTest.cs" />
+    <Compile Include="Assa\AssaTimeCodes.cs" />
+    <Compile Include="Core\AudioToTextTest.cs" />
+    <Compile Include="Core\JsonTest.cs" />
+    <Compile Include="Core\MergeShortLinesUtilsTest.cs" />
+    <Compile Include="Core\CsvUtilTest.cs" />
+    <Compile Include="Core\WebVttHelperTest.cs" />
+    <Compile Include="Core\WebVttToAssaTest.cs" />
+    <Compile Include="Dictionaries\StringWithoutSpaceSplitToWordsTest.cs" />
+    <Compile Include="GoogleCloudVision\GoogleCloudVisionJsonToLinesTest.cs" />
+    <Compile Include="LanguageFiles\LanguageFileTest.cs" />
+    <Compile Include="Logic\AutoTranslate\MergeAndSplitHelperTest.cs" />
+    <Compile Include="Logic\BeautifyTimeCodesTest.cs" />
+    <Compile Include="Logic\ConvertColorsToDialogTest.cs" />
+    <Compile Include="Core\LanguageAutoDetectLanguagesTest.cs" />
+    <Compile Include="Logic\DimensionTest.cs" />
+    <Compile Include="Logic\NetflixHelperTest.cs" />
+    <Compile Include="Logic\SubtitleFormats\EbuStlTest.cs" />
+    <Compile Include="Logic\SubtitleFormats\NetflixTimedTextTest.cs" />
+    <Compile Include="Logic\SubtitleFormats\LrcTest.cs" />
+    <Compile Include="Logic\SubtitleFormats\PacTest.cs" />
+    <Compile Include="Core\UUEncodingTest.cs" />
+    <Compile Include="Core\CharUtilsTest.cs" />
+    <Compile Include="Core\DialogTypeTest.cs" />
+    <Compile Include="Core\SeJsonParserTest.cs" />
+    <Compile Include="Core\FixCasingTest.cs" />
+    <Compile Include="Core\LanguageAutoDetectTest.cs" />
+    <Compile Include="Core\PlainTextImporterTest.cs" />
+    <Compile Include="Core\StringExtensionsTest.cs" />
+    <Compile Include="Core\NikseBitmapTest.cs" />
+    <Compile Include="Core\SubtitleFormatTest.cs" />
+    <Compile Include="Core\SubtitleTest.cs" />
+    <Compile Include="Core\RichTextToPlainTextTest.cs" />
+    <Compile Include="Logic\BridgeGapsTest.cs" />
+    <Compile Include="Logic\Forms\MoveWordUpDownTest.cs" />
+    <Compile Include="Logic\NetflixQualityCheckTest.cs" />
+    <Compile Include="Logic\Ocr\BinaryOcrTest.cs" />
+    <Compile Include="Core\HtmlUtilTest.cs" />
+    <Compile Include="FixCommonErrors\FixCommonErrorsTest.cs" />
+    <Compile Include="Logic\LanguageTest.cs" />
+    <Compile Include="Logic\BluRaySup\BluRaySupParserTest.cs" />
+    <Compile Include="Logic\BluRaySup\ToolBoxTest.cs" />
+    <Compile Include="Logic\Dictionaries\NamesListTest.cs" />
+    <Compile Include="Logic\Dictionaries\OcrFixReplaceListTest.cs" />
+    <Compile Include="Logic\Mp4\Mp4Test.cs" />
+    <Compile Include="Logic\Ocr\MatchesToItalicStringConverterTest.cs" />
+    <Compile Include="Logic\SplitLongLinesHelperTest.cs" />
+    <Compile Include="Logic\SubtitleFormats\Cea708Test.cs" />
+    <Compile Include="Logic\SubtitleFormats\SubtitleFormatFunctionsTest.cs" />
+    <Compile Include="Logic\TarFileTest.cs" />
+    <Compile Include="Logic\ProgressHelperTest.cs" />
+    <Compile Include="Logic\TransportStream\TransportStreamTest.cs" />
+    <Compile Include="Logic\ParagraphTest.cs" />
+    <Compile Include="Logic\StrippableTextTest.cs" />
+    <Compile Include="Logic\TimeCodeTest.cs" />
+    <Compile Include="Logic\UknownFormatImporterJsonTest.cs" />
+    <Compile Include="Logic\ContinuationUtilitiesTest.cs" />
+    <Compile Include="Logic\HtmlUtilTest.cs" />
+    <Compile Include="Logic\VideoFormats\MatroskaTest.cs" />
+    <Compile Include="Logic\VobSub\VobSubTest.cs" />
+    <Compile Include="Logic\Ocr\NOcrTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Logic\Forms\RemoveTextForHearImpairedTest.cs" />
+    <Compile Include="Logic\SubtitleFormats\SubtitleFormatsTest.cs" />
+    <Compile Include="Logic\UtilitiesTest.cs" />
+    <Compile Include="Dictionaries\XmlDictionariesTest.cs" />
+    <Compile Include="UserControls\NikseComboBoxTests.cs" />
+    <Compile Include="UserControls\SeTextBoxTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Dictionaries\en_US.aff" />
+    <EmbeddedResource Include="Dictionaries\en_US.dic" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Dictionaries\names.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Files\sample.tar">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Files\sample_MKV_delayed.mkv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Files\sample_MKV_SRT.mkv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Files\sample_MKV_VobSub_PGS.mkv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Files\sample_MP4.mp4">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Files\sample_TS_with_graphics.ts">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Files\sample_MP4_SRT.mp4">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Files\sample_BDSUP_multi_image.sup">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Files\auto_detect_Danish.srt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Files\auto_detect_Russian.srt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Files\auto_detect_windows-1250.srt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Files\auto_detect_windows-1251.srt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Files\sample_TS_with_teletext.ts">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libse\LibSE.csproj">
+      <Project>{d6f64cd3-c3ea-4b36-b575-9b3b8a3ca13f}</Project>
+      <Name>LibSE</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ui\SubtitleEdit.csproj">
+      <Project>{511a5b59-1c35-4719-8536-23b19af9b21a}</Project>
+      <Name>SubtitleEdit</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NHunspell" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.
     <Target Name="BeforeBuild">
     </Target>
diff --git a/src/Test/app.config b/src/Test/app.config
index d78f94066..9abefa2c2 100644
--- a/src/Test/app.config
+++ b/src/Test/app.config
@@ -1,51 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Win32.Registry" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="mscorlib" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="netstandard" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Collections" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+	</startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Win32.Registry" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
 </configuration>