diff --git a/Test++/Test++.vcxproj b/Test++/Test++.vcxproj
deleted file mode 100644
index 8fd4b66a9..000000000
--- a/Test++/Test++.vcxproj
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>17.0</VCProjectVersion>
-    <ProjectGuid>{E610F11D-1240-4260-87F8-504B49DB6915}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>UnitTest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectSubType>NativeUnitTestProject</ProjectSubType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)modules\c++\;$(SolutionDir)modules\c++\nitf\include\;$(SolutionDir)modules\c\;$(SolutionDir)modules\c\nrt\include\;$(SolutionDir)modules\c\nitf\include\;$(SolutionDir)modules\c\jpeg\include\;$(SolutionDir)modules\c\j2k\include\;$(SolutionDir)modules\c\cgm\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)\target-$(Configuration)\installwindows-latestCMake-Github\include\</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <ConformanceMode>true</ConformanceMode>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <UseStandardPreprocessor>true</UseStandardPreprocessor>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)\target-$(Configuration)\installwindows-latestCMake-Github\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)modules\c\nrt\include\;$(SolutionDir)modules\c\nitf\include\;$(SolutionDir)modules\c\jpeg\include\;$(SolutionDir)modules\c\j2k\include\;$(SolutionDir)modules\c\cgm\include;$(SolutionDir)modules\c\;$(SolutionDir)modules\c++\;$(SolutionDir)modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)\target-$(Configuration)\installwindows-latestCMake-Github\include\</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <ConformanceMode>true</ConformanceMode>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <UseStandardPreprocessor>true</UseStandardPreprocessor>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)\target-$(Configuration)\installwindows-latestCMake-Github\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="nitf_test_j2k_compressed_byte_provider.cpp" />
-    <ClCompile Include="nitf_test_j2k_compress_tile.cpp" />
-    <ClCompile Include="nitf_test_create_nitf++.cpp" />
-    <ClCompile Include="nitf_test_field++.cpp" />
-    <ClCompile Include="nitf_test_hash_table_1++.cpp" />
-    <ClCompile Include="nitf_test_image_blocker.cpp" />
-    <ClCompile Include="nitf_test_image_io.cpp" />
-    <ClCompile Include="nitf_test_image_segment_blank_nm_compression.cpp" />
-    <ClCompile Include="nitf_test_image_segment_computer.cpp" />
-    <ClCompile Include="nitf_test_j2k_loading++.cpp" />
-    <ClCompile Include="nitf_test_j2k_read_tile.cpp" />
-    <ClCompile Include="nitf_test_nitf_buffer_list.cpp" />
-    <ClCompile Include="nitf_test_tre_create++.cpp" />
-    <ClCompile Include="nitf_test_tre_mods++.cpp" />
-    <ClCompile Include="nitf_test_tre_mods.cpp" />
-    <ClCompile Include="nitf_test_tre_read.cpp" />
-    <ClCompile Include="nitf_test_writer_3++.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="j2k_Test.h" />
-    <ClInclude Include="nitf_Test.h" />
-    <ClInclude Include="nrt_Test.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="Test.h" />
-    <ClInclude Include="TestCase.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\modules\c++\nitf-c++.vcxproj">
-      <Project>{8f357a19-799e-4971-850e-3f28485c130b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf-c.vcxproj">
-      <Project>{f06550ad-cfc7-40b8-8727-6c82c69a8982}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\ACCHZB.vcxproj">
-      <Project>{53f9f908-c678-4dee-9309-e71c1d03a45f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\ACCPOB.vcxproj">
-      <Project>{730b1e6e-2469-4f9e-b093-d0c6262453c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\ACFTA.vcxproj">
-      <Project>{51d7b426-899e-428d-9f69-5ddac9e403fb}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\AIMIDB.vcxproj">
-      <Project>{12aa0752-4ee3-4e0a-85af-0e5deadbf343}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\CSCRNA.vcxproj">
-      <Project>{023de06d-3967-4406-b1b8-032118bb2552}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\ENGRDA.vcxproj">
-      <Project>{53f9f908-c678-4dee-9309-e71c1e03a45f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\HISTOA.vcxproj">
-      <Project>{d749aa73-4c9a-473d-96bb-070a6d9caa54}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\JITCID.vcxproj">
-      <Project>{d1d7fcd3-6130-4504-9da0-9d80506be55e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\PTPRAA.vcxproj">
-      <Project>{2baaaca9-a5a4-412c-ae52-b16c2d107f55}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\RPFHDR.vcxproj">
-      <Project>{cf5b4f02-364d-4117-9fb9-6c9c7938e412}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\XML_DATA_CONTENT.vcxproj">
-      <Project>{78849481-d356-4cc7-b182-31c21f857ed1}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Test++/pch.h b/Test++/pch.h
deleted file mode 100644
index ea151fed0..000000000
--- a/Test++/pch.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// pch.h: This is a precompiled header file.
-// Files listed below are compiled only once, improving build performance for future builds.
-// This also affects IntelliSense performance, including code completion and many code browsing features.
-// However, files listed here are ALL re-compiled if any one of them is updated between builds.
-// Do not add files here that you will be updating frequently as this negates the performance advantage.
-
-#ifndef PCH_H
-#define PCH_H
-#pragma once
-
-#pragma warning(disable: 4820) // '...': '...' bytes padding added after data member '...'
-#pragma warning(disable: 4710) // '...': function not inlined
-#pragma warning(disable: 5045) // Compiler will insert Spectre mitigation for memory load if / Qspectre switch specified
-#pragma warning(disable: 4668) // '...' is not defined as a preprocessor macro, replacing with '...' for '...'
-// TODO: get rid of these someday?
-#pragma warning(disable: 5039) //	'...': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
-#pragma warning(disable: 4514) //	'...': unreferenced inline function has been removed
-
-#pragma warning(push)
-#pragma warning(disable: 4464) // relative include path contains '..'
-#pragma warning(disable: 4365) // '...': conversion from '...' to '...', signed/unsigned mismatch
-#include "../modules/c++/cpp.h"
-#pragma warning(pop)
-#pragma comment(lib, "ws2_32")
-
-// We're building in Visual Studio ... used to control where we get a little bit of config info
-#define NITRO_PCH 1
-
-#pragma warning(disable: 5032) // detected #pragma warning(push) with no corresponding #pragma warning(pop)
-#pragma warning(push)
-#pragma warning(disable: 4464) // relative include path contains '..'
-#pragma warning(disable: 4625) // '...' : copy constructor was implicitly defined as deleted
-#pragma warning(disable: 4626) // '...' : assignment operator was implicitly defined as deleted
-#include <nitf/coda-oss.hpp>
-#include <math/Round.h>
-#include <import/io.h>
-#include <io/TempFile.h>
-#include <io/ReadUtils.h>
-#include <import/sio/lite.h>
-#pragma warning(disable: 5031) // #pragma warning(pop): likely mismatch, popping warning state pushed in different file
-#pragma comment(lib, "io-c++")
-#pragma comment(lib, "except-c++")
-#pragma comment(lib, "sys-c++")
-#pragma comment(lib, "str-c++")
-#pragma comment(lib, "sio.lite-c++.lib")
-#pragma comment(lib, "math-c++")
-#pragma comment(lib, "mt-c++")
-#pragma warning(pop)
-
-#pragma warning(push)
-#include "CppUnitTest.h"
-#pragma warning(pop)
-
-#include <import/nitf.h>
-
-#include <import/nitf.hpp>
-#include <nitf/TRE.hpp>
-#include <nitf/exports.hpp>
-#include <nitf/TREField.hpp>
-#include <nitf/FieldDescriptor.hpp>
-#include <nitf/TestingTest.hpp>
-#include <nitf/ImageWriter.hpp>
-#include <nitf/J2KComponent.hpp>
-#include <nitf/J2KContainer.hpp>
-#include <nitf/J2KReader.hpp>
-#include <nitf/J2KWriter.hpp>
-#include <nitf/J2KCompressor.hpp>
-#include <nitf/IOStreamWriter.hpp>
-
-#include "nitf_Test.h"
-#include "Test.h"
-
-#endif //PCH_H
diff --git a/Test/Test.h b/Test/Test.h
deleted file mode 100644
index f73b98464..000000000
--- a/Test/Test.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <string>
-
-#include "CppUnitTest.h"
-
-#define TEST_ASSERT(X) Assert::IsTrue((X) ? true : false)
-
-template<typename T, typename U>
-inline void test_assert_eq_(T&& t, U&& u)
-{
-	Microsoft::VisualStudio::CppUnitTestFramework::Assert::AreEqual(t, u);
-	Microsoft::VisualStudio::CppUnitTestFramework::Assert::AreEqual(u, t);
-}
-#define TEST_ASSERT_EQ(X1, X2) test_assert_eq_(X1, X2);
-#define TEST_ASSERT_EQ_INT(X1, X2) TEST_ASSERT_EQ(X2, X1)
-#define TEST_ASSERT_EQ_STR(X1, X2) TEST_ASSERT_EQ(std::string(X1), std::string(X2))
-#define TEST_ASSERT_EQ_FLOAT(X1, X2) TEST_ASSERT_EQ(static_cast<float>(X1), static_cast<float>(X2))
-
-#define TEST_ASSERT_NULL(X) Assert::IsNull((X))
-#define TEST_ASSERT_NOT_NULL(X) Assert::IsNotNull((X))
-#define TEST_ASSERT_TRUE(X) Assert::IsTrue((X))
-#define TEST_ASSERT_FALSE(X) Assert::IsFalse((X))
-
-template<typename T, typename U>
-inline void test_assert_not_eq_(T&& t, U&& u)
-{
-	Microsoft::VisualStudio::CppUnitTestFramework::Assert::AreNotEqual(t, u);
-	Microsoft::VisualStudio::CppUnitTestFramework::Assert::AreNotEqual(u, t);
-}
-#define TEST_ASSERT_NOT_EQ(X1, X2) test_assert_not_eq_(X1, X2);
-template<typename T, typename U>
-inline void test_assert_greater_(T&& t, U&& u)
-{
-	Microsoft::VisualStudio::CppUnitTestFramework::Assert::IsTrue(t > u);
-}
-#define TEST_ASSERT_GREATER(X1, X2) test_assert_greater_(X1, X2)
-
-#define TEST_ASSERT_ALMOST_EQ_EPS(X1, X2, EPS) { Microsoft::VisualStudio::CppUnitTestFramework::Assert:AreEqual(X1, X2, EPS); Microsoft::VisualStudio::CppUnitTestFramework::Assert:AreEqual(X2, X1, EPS); }
-#define TEST_ASSERT_ALMOST_EQ(X1, X2) TEST_ASSERT_ALMOST_EQ_EPS(X1, X2, 0.0001)
-
-#define TEST_ASSERT_EQ_MSG(msg, X1, X2) Logger::WriteMessage(msg.c_str()); TEST_ASSERT_EQ(X1, X2)
-
-#define TEST_EXCEPTION(X) try { (X); TEST_ASSERT_FALSE(false); } catch (...) { TEST_ASSERT_TRUE(true); }
-#define TEST_THROWS(X) TEST_EXCEPTION(X)
-
-#define TEST_MAIN(X)
diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj
deleted file mode 100644
index a671716a8..000000000
--- a/Test/Test.vcxproj
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>17.0</VCProjectVersion>
-    <ProjectGuid>{238C9787-B27D-4107-B8FD-1BDB49EA8023}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>UnitTest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectSubType>NativeUnitTestProject</ProjectSubType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)modules\c\nrt\include\;$(SolutionDir)modules\c\nitf\include\;$(SolutionDir)modules\c\jpeg\include\;$(SolutionDir)modules\c\j2k\include\;$(SolutionDir)modules\c\cgm\include;$(SolutionDir)modules\c\;$(SolutionDir)modules\c++\;$(SolutionDir)modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)\target-$(Configuration)\installwindows-latestCMake-Github\include\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <ConformanceMode>true</ConformanceMode>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <UseStandardPreprocessor>true</UseStandardPreprocessor>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)\target-$(Configuration)\installwindows-latestCMake-Github\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)modules\c\nrt\include\;$(SolutionDir)modules\c\nitf\include\;$(SolutionDir)modules\c\jpeg\include\;$(SolutionDir)modules\c\j2k\include\;$(SolutionDir)modules\c\cgm\include;$(SolutionDir)modules\c\;$(SolutionDir)modules\c++\;$(SolutionDir)modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)\target-$(Configuration)\installwindows-latestCMake-Github\include\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <ConformanceMode>true</ConformanceMode>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <UseStandardPreprocessor>true</UseStandardPreprocessor>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)\target-$(Configuration)\installwindows-latestCMake-Github\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="nitf_test_create.cpp" />
-    <ClCompile Include="nitf_test_create_nitf.cpp" />
-    <ClCompile Include="nitf_test_field.cpp" />
-    <ClCompile Include="nitf_test_geo_utils.cpp" />
-    <ClCompile Include="nitf_test_image_io.cpp" />
-    <ClCompile Include="nitf_test_mem_source.cpp" />
-    <ClCompile Include="nitf_test_zero_field.cpp" />
-    <ClCompile Include="nrt_test_buffer_adapter.cpp" />
-    <ClCompile Include="nrt_test_core_values.cpp" />
-    <ClCompile Include="nrt_test_list.cpp" />
-    <ClCompile Include="nrt_test_nrt_byte_swap.cpp" />
-    <ClCompile Include="nrt_test_nrt_datetime.cpp" />
-    <ClCompile Include="nrt_test_tree.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="nrt_test_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="j2k_Test.h" />
-    <ClInclude Include="nitf_Test.h" />
-    <ClInclude Include="nrt_Test.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="Test.h" />
-    <ClInclude Include="TestCase.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\modules\c++\nitf-c++.vcxproj">
-      <Project>{8f357a19-799e-4971-850e-3f28485c130b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf-c.vcxproj">
-      <Project>{f06550ad-cfc7-40b8-8727-6c82c69a8982}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\ACCHZB.vcxproj">
-      <Project>{53f9f908-c678-4dee-9309-e71c1d03a45f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\ACCPOB.vcxproj">
-      <Project>{730b1e6e-2469-4f9e-b093-d0c6262453c9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\ACFTA.vcxproj">
-      <Project>{51d7b426-899e-428d-9f69-5ddac9e403fb}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\AIMIDB.vcxproj">
-      <Project>{12aa0752-4ee3-4e0a-85af-0e5deadbf343}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\CSCRNA.vcxproj">
-      <Project>{023de06d-3967-4406-b1b8-032118bb2552}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\ENGRDA.vcxproj">
-      <Project>{53f9f908-c678-4dee-9309-e71c1e03a45f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\HISTOA.vcxproj">
-      <Project>{d749aa73-4c9a-473d-96bb-070a6d9caa54}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\JITCID.vcxproj">
-      <Project>{d1d7fcd3-6130-4504-9da0-9d80506be55e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\PTPRAA.vcxproj">
-      <Project>{2baaaca9-a5a4-412c-ae52-b16c2d107f55}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\RPFHDR.vcxproj">
-      <Project>{cf5b4f02-364d-4117-9fb9-6c9c7938e412}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\modules\c\nitf\XML_DATA_CONTENT.vcxproj">
-      <Project>{78849481-d356-4cc7-b182-31c21f857ed1}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file