Made modifications to allow library and tests to compile under the Visual Studio November CPT