diff --git a/LICENSE b/LICENSE
index 64d58560e..70d9316e7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -36,11 +36,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 
-AN EXCEPTION applies to all files in the ./test/models subfolder.
+AN EXCEPTION applies to all files in the ./test/models-nonbsd subfolder.
 These are 3d models for testing purposes, from various free sources
 on the internet. They are - unless otherwise stated - copyright of
-their respective creators. For a specific 3d model, see 
-<model>.source.txt for more legal information. If you're such a 
-copyright holder and you believe we credited you inproperly or you 
-don't want your files to appear in our repository, contact us.
+their respective creators, which may impose additional requirements
+on the use of their work. For any of these models, see 
+<model-name>.source.txt for more legal information. Contact us if you
+are a copyright holder and believe that we credited you inproperly or 
+if you don't want your files to appear in the repository.
 
diff --git a/samples/SimpleOpenGL/Sample_SimpleOpenGL.c b/samples/SimpleOpenGL/Sample_SimpleOpenGL.c
index a9512735c..712ecea09 100644
--- a/samples/SimpleOpenGL/Sample_SimpleOpenGL.c
+++ b/samples/SimpleOpenGL/Sample_SimpleOpenGL.c
@@ -339,8 +339,10 @@ int main(int argc, char **argv)
 	stream = aiGetPredefinedLogStream(aiDefaultLogStream_FILE,"assimp_log.txt");
 	aiAttachLogStream(&stream);
 
-	if( 0 != loadasset( argc >= 2 ? argv[1] : "../../test/models/X/dwarf.x")) {
-		if( argc != 1 || 0 != loadasset( "../../../../test/models/X/dwarf.x")) { 
+	// the model name can be specified on the command line. we try to locate
+	// one of the more expressive test models from the repository.
+	if( 0 != loadasset( argc >= 2 ? argv[1] : "../../test/models-nonbsd/X/dwarf.x")) {
+		if( argc != 1 || 0 != loadasset( "../../../../test/models-nonbsd/X/dwarf.x") && 0 != loadasset( "../../test/models/X/Testwuson.X")) { 
 			return -1;
 		}
 	}
diff --git a/samples/SimpleOpenGL/SimpleOpenGL_VC8.sln b/samples/SimpleOpenGL/SimpleOpenGL.sln
similarity index 100%
rename from samples/SimpleOpenGL/SimpleOpenGL_VC8.sln
rename to samples/SimpleOpenGL/SimpleOpenGL.sln
diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
index 56f1e64cd..ff87be11b 100644
--- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
+++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
@@ -37,8 +37,8 @@
 
 
 // currently these are hardcoded
-static const std::string basepath = "../../test/models/X/";
-static const std::string modelname = "dwarf.x";
+static const std::string basepath = "../../test/models/OBJ/";
+static const std::string modelname = "spider.obj";
 
 
 HGLRC		hRC=NULL;			// Permanent Rendering Context
diff --git a/samples/bin/ShowDwarf.bat b/samples/bin/ShowDwarf.bat
new file mode 100644
index 000000000..935343fb0
--- /dev/null
+++ b/samples/bin/ShowDwarf.bat
@@ -0,0 +1 @@
+SimpleOpenGL.exe ..\..\test\models-nonbsd\X\dwarf.X
\ No newline at end of file
diff --git a/samples/bin/ShowWuson.bat b/samples/bin/ShowWuson.bat
new file mode 100644
index 000000000..9eb879dde
--- /dev/null
+++ b/samples/bin/ShowWuson.bat
@@ -0,0 +1 @@
+SimpleOpenGL.exe ..\..\test\models\X\Testwuson.X
\ No newline at end of file
diff --git a/test/models/3D/mar_rifle.source.txt b/test/models-nonbsd/3D/mar_rifle.source.txt
similarity index 100%
rename from test/models/3D/mar_rifle.source.txt
rename to test/models-nonbsd/3D/mar_rifle.source.txt
diff --git a/test/models/3D/mar_rifle.uc b/test/models-nonbsd/3D/mar_rifle.uc
similarity index 100%
rename from test/models/3D/mar_rifle.uc
rename to test/models-nonbsd/3D/mar_rifle.uc
diff --git a/test/models/3D/mar_rifle_a.3d b/test/models-nonbsd/3D/mar_rifle_a.3d
similarity index 100%
rename from test/models/3D/mar_rifle_a.3d
rename to test/models-nonbsd/3D/mar_rifle_a.3d
diff --git a/test/models/3D/mar_rifle_d.3d b/test/models-nonbsd/3D/mar_rifle_d.3d
similarity index 100%
rename from test/models/3D/mar_rifle_d.3d
rename to test/models-nonbsd/3D/mar_rifle_d.3d
diff --git a/test/models/3DS/Granate.3DS b/test/models-nonbsd/3DS/Granate.3DS
similarity index 100%
rename from test/models/3DS/Granate.3DS
rename to test/models-nonbsd/3DS/Granate.3DS
diff --git a/test/models/3DS/cart_wheel.3DS b/test/models-nonbsd/3DS/cart_wheel.3DS
similarity index 100%
rename from test/models/3DS/cart_wheel.3DS
rename to test/models-nonbsd/3DS/cart_wheel.3DS
diff --git a/test/models/3DS/cart_wheel.source.txt b/test/models-nonbsd/3DS/cart_wheel.source.txt
similarity index 100%
rename from test/models/3DS/cart_wheel.source.txt
rename to test/models-nonbsd/3DS/cart_wheel.source.txt
diff --git a/test/models/3DS/jeep1.3ds b/test/models-nonbsd/3DS/jeep1.3ds
similarity index 100%
rename from test/models/3DS/jeep1.3ds
rename to test/models-nonbsd/3DS/jeep1.3ds
diff --git a/test/models/3DS/jeep1.3ds.readme.txt b/test/models-nonbsd/3DS/jeep1.3ds.readme.txt
similarity index 100%
rename from test/models/3DS/jeep1.3ds.readme.txt
rename to test/models-nonbsd/3DS/jeep1.3ds.readme.txt
diff --git a/test/models/3DS/jeep1.jpg b/test/models-nonbsd/3DS/jeep1.jpg
similarity index 100%
rename from test/models/3DS/jeep1.jpg
rename to test/models-nonbsd/3DS/jeep1.jpg
diff --git a/test/models/3DS/m_rifl.bmp b/test/models-nonbsd/3DS/m_rifl.bmp
similarity index 100%
rename from test/models/3DS/m_rifl.bmp
rename to test/models-nonbsd/3DS/m_rifl.bmp
diff --git a/test/models/3DS/mar_rifle.3ds b/test/models-nonbsd/3DS/mar_rifle.3ds
similarity index 100%
rename from test/models/3DS/mar_rifle.3ds
rename to test/models-nonbsd/3DS/mar_rifle.3ds
diff --git a/test/models/3DS/mar_rifle.source.txt b/test/models-nonbsd/3DS/mar_rifle.source.txt
similarity index 100%
rename from test/models/3DS/mar_rifle.source.txt
rename to test/models-nonbsd/3DS/mar_rifle.source.txt
diff --git a/test/models/3DS/mp5_sil.3ds b/test/models-nonbsd/3DS/mp5_sil.3ds
similarity index 100%
rename from test/models/3DS/mp5_sil.3ds
rename to test/models-nonbsd/3DS/mp5_sil.3ds
diff --git a/test/models/3DS/mp5_sil.source.txt b/test/models-nonbsd/3DS/mp5_sil.source.txt
similarity index 100%
rename from test/models/3DS/mp5_sil.source.txt
rename to test/models-nonbsd/3DS/mp5_sil.source.txt
diff --git a/test/models/3DS/mp5sil.bmp b/test/models-nonbsd/3DS/mp5sil.bmp
similarity index 100%
rename from test/models/3DS/mp5sil.bmp
rename to test/models-nonbsd/3DS/mp5sil.bmp
diff --git a/test/models/3DS/pyramob.3DS b/test/models-nonbsd/3DS/pyramob.3DS
similarity index 100%
rename from test/models/3DS/pyramob.3DS
rename to test/models-nonbsd/3DS/pyramob.3DS
diff --git a/test/models/3DS/pyramob.3ds.readme.txt b/test/models-nonbsd/3DS/pyramob.3ds.readme.txt
similarity index 100%
rename from test/models/3DS/pyramob.3ds.readme.txt
rename to test/models-nonbsd/3DS/pyramob.3ds.readme.txt
diff --git a/test/models/ASE/Rifle.ase b/test/models-nonbsd/ASE/Rifle.ase
similarity index 100%
rename from test/models/ASE/Rifle.ase
rename to test/models-nonbsd/ASE/Rifle.ase
diff --git a/test/models/ASE/Rifle.source.txt b/test/models-nonbsd/ASE/Rifle.source.txt
similarity index 100%
rename from test/models/ASE/Rifle.source.txt
rename to test/models-nonbsd/ASE/Rifle.source.txt
diff --git a/test/models/ASE/Rifle2.ase b/test/models-nonbsd/ASE/Rifle2.ase
similarity index 100%
rename from test/models/ASE/Rifle2.ase
rename to test/models-nonbsd/ASE/Rifle2.ase
diff --git a/test/models/ASE/Rifle2.source.txt b/test/models-nonbsd/ASE/Rifle2.source.txt
similarity index 100%
rename from test/models/ASE/Rifle2.source.txt
rename to test/models-nonbsd/ASE/Rifle2.source.txt
diff --git a/test/models/B3D/axe.jpg b/test/models-nonbsd/B3D/axe.jpg
similarity index 100%
rename from test/models/B3D/axe.jpg
rename to test/models-nonbsd/B3D/axe.jpg
diff --git a/test/models/B3D/dwarf.source.txt b/test/models-nonbsd/B3D/dwarf.source.txt
similarity index 100%
rename from test/models/B3D/dwarf.source.txt
rename to test/models-nonbsd/B3D/dwarf.source.txt
diff --git a/test/models/B3D/dwarf2.b3d b/test/models-nonbsd/B3D/dwarf2.b3d
similarity index 100%
rename from test/models/B3D/dwarf2.b3d
rename to test/models-nonbsd/B3D/dwarf2.b3d
diff --git a/test/models/B3D/dwarf2.jpg b/test/models-nonbsd/B3D/dwarf2.jpg
similarity index 100%
rename from test/models/B3D/dwarf2.jpg
rename to test/models-nonbsd/B3D/dwarf2.jpg
diff --git a/test/models/B3D/turtle.source.txt b/test/models-nonbsd/B3D/turtle.source.txt
similarity index 100%
rename from test/models/B3D/turtle.source.txt
rename to test/models-nonbsd/B3D/turtle.source.txt
diff --git a/test/models/B3D/turtle1.b3d b/test/models-nonbsd/B3D/turtle1.b3d
similarity index 100%
rename from test/models/B3D/turtle1.b3d
rename to test/models-nonbsd/B3D/turtle1.b3d
diff --git a/test/models/B3D/turtle1.png b/test/models-nonbsd/B3D/turtle1.png
similarity index 100%
rename from test/models/B3D/turtle1.png
rename to test/models-nonbsd/B3D/turtle1.png
diff --git a/test/models/BLEND/Bob.blend b/test/models-nonbsd/BLEND/Bob.blend
similarity index 100%
rename from test/models/BLEND/Bob.blend
rename to test/models-nonbsd/BLEND/Bob.blend
diff --git a/test/models/BLEND/bob.source.txt b/test/models-nonbsd/BLEND/bob.source.txt
similarity index 100%
rename from test/models/BLEND/bob.source.txt
rename to test/models-nonbsd/BLEND/bob.source.txt
diff --git a/test/models/DXF/rifle.dxf b/test/models-nonbsd/DXF/rifle.dxf
similarity index 100%
rename from test/models/DXF/rifle.dxf
rename to test/models-nonbsd/DXF/rifle.dxf
diff --git a/test/models/DXF/rifle.source.txt b/test/models-nonbsd/DXF/rifle.source.txt
similarity index 100%
rename from test/models/DXF/rifle.source.txt
rename to test/models-nonbsd/DXF/rifle.source.txt
diff --git a/test/models/HMP/terrain_withtexture.hmp b/test/models-nonbsd/HMP/terrain_withtexture.hmp
similarity index 100%
rename from test/models/HMP/terrain_withtexture.hmp
rename to test/models-nonbsd/HMP/terrain_withtexture.hmp
diff --git a/test/models/IRR/skybox.xml b/test/models-nonbsd/IRR/skybox.xml
similarity index 100%
rename from test/models/IRR/skybox.xml
rename to test/models-nonbsd/IRR/skybox.xml
diff --git a/test/models/IRR/skybox/credits.txt b/test/models-nonbsd/IRR/skybox/credits.txt
similarity index 100%
rename from test/models/IRR/skybox/credits.txt
rename to test/models-nonbsd/IRR/skybox/credits.txt
diff --git a/test/models/IRR/skybox/default_skybox0.jpg b/test/models-nonbsd/IRR/skybox/default_skybox0.jpg
similarity index 100%
rename from test/models/IRR/skybox/default_skybox0.jpg
rename to test/models-nonbsd/IRR/skybox/default_skybox0.jpg
diff --git a/test/models/IRR/skybox/default_skybox1.jpg b/test/models-nonbsd/IRR/skybox/default_skybox1.jpg
similarity index 100%
rename from test/models/IRR/skybox/default_skybox1.jpg
rename to test/models-nonbsd/IRR/skybox/default_skybox1.jpg
diff --git a/test/models/IRR/skybox/default_skybox2.jpg b/test/models-nonbsd/IRR/skybox/default_skybox2.jpg
similarity index 100%
rename from test/models/IRR/skybox/default_skybox2.jpg
rename to test/models-nonbsd/IRR/skybox/default_skybox2.jpg
diff --git a/test/models/IRR/skybox/default_skybox3.jpg b/test/models-nonbsd/IRR/skybox/default_skybox3.jpg
similarity index 100%
rename from test/models/IRR/skybox/default_skybox3.jpg
rename to test/models-nonbsd/IRR/skybox/default_skybox3.jpg
diff --git a/test/models/IRR/skybox/default_skyboxdn.jpg b/test/models-nonbsd/IRR/skybox/default_skyboxdn.jpg
similarity index 100%
rename from test/models/IRR/skybox/default_skyboxdn.jpg
rename to test/models-nonbsd/IRR/skybox/default_skyboxdn.jpg
diff --git a/test/models/IRR/skybox/default_skyboxup.jpg b/test/models-nonbsd/IRR/skybox/default_skyboxup.jpg
similarity index 100%
rename from test/models/IRR/skybox/default_skyboxup.jpg
rename to test/models-nonbsd/IRR/skybox/default_skyboxup.jpg
diff --git a/test/models/LWO/LWO2/LWSReferences/MTL_ChromeUniversal.JPG b/test/models-nonbsd/LWO/LWO2/LWSReferences/MTL_ChromeUniversal.JPG
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/MTL_ChromeUniversal.JPG
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/MTL_ChromeUniversal.JPG
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--Arm-ForeArm.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Arm-ForeArm.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--Arm-ForeArm.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Arm-ForeArm.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--Arm-Shoulder.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Arm-Shoulder.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--Arm-Shoulder.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Arm-Shoulder.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--Arm-Tip.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Arm-Tip.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--Arm-Tip.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Arm-Tip.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--CabinPortals.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--CabinPortals.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--CabinPortals.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--CabinPortals.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--Chasis.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Chasis.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--Chasis.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Chasis.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--GP-Gun.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--GP-Gun.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--GP-Gun.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--GP-Gun.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--GP-Lid.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--GP-Lid.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--GP-Lid.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--GP-Lid.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--GP-Pod.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--GP-Pod.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--GP-Pod.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--GP-Pod.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--Laserbeam.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Laserbeam.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--Laserbeam.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Laserbeam.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--Standin-Driver.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Standin-Driver.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--Standin-Driver.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Standin-Driver.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--Wheels-Back.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Wheels-Back.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--Wheels-Back.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Wheels-Back.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw--Wheels-Front.lwo b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Wheels-Front.lwo
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw--Wheels-Front.lwo
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw--Wheels-Front.lwo
diff --git a/test/models/LWO/LWO2/LWSReferences/QuickDraw.source.txt b/test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw.source.txt
similarity index 100%
rename from test/models/LWO/LWO2/LWSReferences/QuickDraw.source.txt
rename to test/models-nonbsd/LWO/LWO2/LWSReferences/QuickDraw.source.txt
diff --git a/test/models/LWO/LWO2/rifle.lwo b/test/models-nonbsd/LWO/LWO2/rifle.lwo
similarity index 100%
rename from test/models/LWO/LWO2/rifle.lwo
rename to test/models-nonbsd/LWO/LWO2/rifle.lwo
diff --git a/test/models/LWO/LWO2/rifle.source.txt b/test/models-nonbsd/LWO/LWO2/rifle.source.txt
similarity index 100%
rename from test/models/LWO/LWO2/rifle.source.txt
rename to test/models-nonbsd/LWO/LWO2/rifle.source.txt
diff --git a/test/models/LWS/QuickDraw v.2.2.lws b/test/models-nonbsd/LWS/QuickDraw v.2.2.lws
similarity index 100%
rename from test/models/LWS/QuickDraw v.2.2.lws
rename to test/models-nonbsd/LWS/QuickDraw v.2.2.lws
diff --git a/test/models/LWS/QuickDraw v.2.2_oldformat_56.lws b/test/models-nonbsd/LWS/QuickDraw v.2.2_oldformat_56.lws
similarity index 100%
rename from test/models/LWS/QuickDraw v.2.2_oldformat_56.lws
rename to test/models-nonbsd/LWS/QuickDraw v.2.2_oldformat_56.lws
diff --git a/test/models/LWS/QuickDraw v2.2.source.txt b/test/models-nonbsd/LWS/QuickDraw v2.2.source.txt
similarity index 100%
rename from test/models/LWS/QuickDraw v2.2.source.txt
rename to test/models-nonbsd/LWS/QuickDraw v2.2.source.txt
diff --git a/test/models/MD2/dolphin.md2 b/test/models-nonbsd/MD2/dolphin.md2
similarity index 100%
rename from test/models/MD2/dolphin.md2
rename to test/models-nonbsd/MD2/dolphin.md2
diff --git a/test/models/MD2/dolphin_f.bmp b/test/models-nonbsd/MD2/dolphin_f.bmp
similarity index 100%
rename from test/models/MD2/dolphin_f.bmp
rename to test/models-nonbsd/MD2/dolphin_f.bmp
diff --git a/test/models/MD2/flag.md2 b/test/models-nonbsd/MD2/flag.md2
similarity index 100%
rename from test/models/MD2/flag.md2
rename to test/models-nonbsd/MD2/flag.md2
diff --git a/test/models/MD2/horse.md2 b/test/models-nonbsd/MD2/horse.md2
similarity index 100%
rename from test/models/MD2/horse.md2
rename to test/models-nonbsd/MD2/horse.md2
diff --git a/test/models/MD2/source.txt b/test/models-nonbsd/MD2/source.txt
similarity index 100%
rename from test/models/MD2/source.txt
rename to test/models-nonbsd/MD2/source.txt
diff --git a/test/models/MD3/q3root/models/mapobjects/kt_kubalwagon/euro_frnt_2.tga b/test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/euro_frnt_2.tga
similarity index 100%
rename from test/models/MD3/q3root/models/mapobjects/kt_kubalwagon/euro_frnt_2.tga
rename to test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/euro_frnt_2.tga
diff --git a/test/models/MD3/q3root/models/mapobjects/kt_kubalwagon/european_fnt.tga b/test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/european_fnt.tga
similarity index 100%
rename from test/models/MD3/q3root/models/mapobjects/kt_kubalwagon/european_fnt.tga
rename to test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/european_fnt.tga
diff --git a/test/models/MD3/q3root/models/mapobjects/kt_kubalwagon/european_fnt_v2.md3 b/test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/european_fnt_v2.md3
similarity index 100%
rename from test/models/MD3/q3root/models/mapobjects/kt_kubalwagon/european_fnt_v2.md3
rename to test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/european_fnt_v2.md3
diff --git a/test/models/MD3/q3root/models/mapobjects/kt_kubalwagon/readme_kubalwagon.txt b/test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/readme_kubalwagon.txt
similarity index 100%
rename from test/models/MD3/q3root/models/mapobjects/kt_kubalwagon/readme_kubalwagon.txt
rename to test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/readme_kubalwagon.txt
diff --git a/test/models/MD3/q3root/scripts/kt_kubalwagon.shader b/test/models-nonbsd/MD3/q3root/scripts/kt_kubalwagon.shader
similarity index 100%
rename from test/models/MD3/q3root/scripts/kt_kubalwagon.shader
rename to test/models-nonbsd/MD3/q3root/scripts/kt_kubalwagon.shader
diff --git a/test/models/MD3/readme_water.txt b/test/models-nonbsd/MD3/readme_water.txt
similarity index 100%
rename from test/models/MD3/readme_water.txt
rename to test/models-nonbsd/MD3/readme_water.txt
diff --git a/test/models/MD3/water_can.tga b/test/models-nonbsd/MD3/water_can.tga
similarity index 100%
rename from test/models/MD3/water_can.tga
rename to test/models-nonbsd/MD3/water_can.tga
diff --git a/test/models/MD3/watercan.md3 b/test/models-nonbsd/MD3/watercan.md3
similarity index 100%
rename from test/models/MD3/watercan.md3
rename to test/models-nonbsd/MD3/watercan.md3
diff --git a/test/models/MD3/watercan_dmg.md3 b/test/models-nonbsd/MD3/watercan_dmg.md3
similarity index 100%
rename from test/models/MD3/watercan_dmg.md3
rename to test/models-nonbsd/MD3/watercan_dmg.md3
diff --git a/test/models/MD5/BoarMan.md5mesh b/test/models-nonbsd/MD5/BoarMan.md5mesh
similarity index 100%
rename from test/models/MD5/BoarMan.md5mesh
rename to test/models-nonbsd/MD5/BoarMan.md5mesh
diff --git a/test/models/MD5/BoarMan.source.txt b/test/models-nonbsd/MD5/BoarMan.source.txt
similarity index 100%
rename from test/models/MD5/BoarMan.source.txt
rename to test/models-nonbsd/MD5/BoarMan.source.txt
diff --git a/test/models/MD5/Bob.md5anim b/test/models-nonbsd/MD5/Bob.md5anim
similarity index 100%
rename from test/models/MD5/Bob.md5anim
rename to test/models-nonbsd/MD5/Bob.md5anim
diff --git a/test/models/MD5/Bob.md5mesh b/test/models-nonbsd/MD5/Bob.md5mesh
similarity index 100%
rename from test/models/MD5/Bob.md5mesh
rename to test/models-nonbsd/MD5/Bob.md5mesh
diff --git a/test/models/MD5/bob.source.txt b/test/models-nonbsd/MD5/bob.source.txt
similarity index 100%
rename from test/models/MD5/bob.source.txt
rename to test/models-nonbsd/MD5/bob.source.txt
diff --git a/test/models/MD5/guard1_body.png b/test/models-nonbsd/MD5/guard1_body.png
similarity index 100%
rename from test/models/MD5/guard1_body.png
rename to test/models-nonbsd/MD5/guard1_body.png
diff --git a/test/models/MD5/guard1_face.png b/test/models-nonbsd/MD5/guard1_face.png
similarity index 100%
rename from test/models/MD5/guard1_face.png
rename to test/models-nonbsd/MD5/guard1_face.png
diff --git a/test/models/MD5/guard1_helmet.png b/test/models-nonbsd/MD5/guard1_helmet.png
similarity index 100%
rename from test/models/MD5/guard1_helmet.png
rename to test/models-nonbsd/MD5/guard1_helmet.png
diff --git a/test/models/MD5/iron_grill.png b/test/models-nonbsd/MD5/iron_grill.png
similarity index 100%
rename from test/models/MD5/iron_grill.png
rename to test/models-nonbsd/MD5/iron_grill.png
diff --git a/test/models/MD5/round_grill.png b/test/models-nonbsd/MD5/round_grill.png
similarity index 100%
rename from test/models/MD5/round_grill.png
rename to test/models-nonbsd/MD5/round_grill.png
diff --git a/test/models/MDL/IDPO (Quake1)/gijoe-readme.txt b/test/models-nonbsd/MDL/IDPO (Quake1)/gijoe-readme.txt
similarity index 100%
rename from test/models/MDL/IDPO (Quake1)/gijoe-readme.txt
rename to test/models-nonbsd/MDL/IDPO (Quake1)/gijoe-readme.txt
diff --git a/test/models/MDL/IDPO (Quake1)/gijoe.mdl b/test/models-nonbsd/MDL/IDPO (Quake1)/gijoe.mdl
similarity index 100%
rename from test/models/MDL/IDPO (Quake1)/gijoe.mdl
rename to test/models-nonbsd/MDL/IDPO (Quake1)/gijoe.mdl
diff --git a/test/models/MDL/IDPO (Quake1)/steg.mdl b/test/models-nonbsd/MDL/IDPO (Quake1)/steg.mdl
similarity index 100%
rename from test/models/MDL/IDPO (Quake1)/steg.mdl
rename to test/models-nonbsd/MDL/IDPO (Quake1)/steg.mdl
diff --git a/test/models/MDL/IDPO (Quake1)/steg.txt b/test/models-nonbsd/MDL/IDPO (Quake1)/steg.txt
similarity index 100%
rename from test/models/MDL/IDPO (Quake1)/steg.txt
rename to test/models-nonbsd/MDL/IDPO (Quake1)/steg.txt
diff --git a/test/models/MDL/IDPO (Quake1)/tekmechbot.MDL b/test/models-nonbsd/MDL/IDPO (Quake1)/tekmechbot.MDL
similarity index 100%
rename from test/models/MDL/IDPO (Quake1)/tekmechbot.MDL
rename to test/models-nonbsd/MDL/IDPO (Quake1)/tekmechbot.MDL
diff --git a/test/models/MDL/IDPO (Quake1)/tekmechbot.txt b/test/models-nonbsd/MDL/IDPO (Quake1)/tekmechbot.txt
similarity index 100%
rename from test/models/MDL/IDPO (Quake1)/tekmechbot.txt
rename to test/models-nonbsd/MDL/IDPO (Quake1)/tekmechbot.txt
diff --git a/test/models/MDL/MDL7 (3DGS A7)/barkD_texture.bmp b/test/models-nonbsd/MDL/MDL7 (3DGS A7)/barkD_texture.bmp
similarity index 100%
rename from test/models/MDL/MDL7 (3DGS A7)/barkD_texture.bmp
rename to test/models-nonbsd/MDL/MDL7 (3DGS A7)/barkD_texture.bmp
diff --git a/test/models/MDL/MDL7 (3DGS A7)/branchD_texture.png b/test/models-nonbsd/MDL/MDL7 (3DGS A7)/branchD_texture.png
similarity index 100%
rename from test/models/MDL/MDL7 (3DGS A7)/branchD_texture.png
rename to test/models-nonbsd/MDL/MDL7 (3DGS A7)/branchD_texture.png
diff --git a/test/models/MDL/MDL7 (3DGS A7)/broadleavedtreeD.mdl b/test/models-nonbsd/MDL/MDL7 (3DGS A7)/broadleavedtreeD.mdl
similarity index 100%
rename from test/models/MDL/MDL7 (3DGS A7)/broadleavedtreeD.mdl
rename to test/models-nonbsd/MDL/MDL7 (3DGS A7)/broadleavedtreeD.mdl
diff --git a/test/models/MDL/MDL7 (3DGS A7)/broadleavedtreeD_readme.rtf b/test/models-nonbsd/MDL/MDL7 (3DGS A7)/broadleavedtreeD_readme.rtf
similarity index 100%
rename from test/models/MDL/MDL7 (3DGS A7)/broadleavedtreeD_readme.rtf
rename to test/models-nonbsd/MDL/MDL7 (3DGS A7)/broadleavedtreeD_readme.rtf
diff --git a/test/models/NFF/NFFSense8/HOME4.NFF b/test/models-nonbsd/NFF/NFFSense8/HOME4.NFF
similarity index 100%
rename from test/models/NFF/NFFSense8/HOME4.NFF
rename to test/models-nonbsd/NFF/NFFSense8/HOME4.NFF
diff --git a/test/models/NFF/NFFSense8/WithMaterial.mat b/test/models-nonbsd/NFF/NFFSense8/WithMaterial.mat
similarity index 100%
rename from test/models/NFF/NFFSense8/WithMaterial.mat
rename to test/models-nonbsd/NFF/NFFSense8/WithMaterial.mat
diff --git a/test/models/NFF/NFFSense8/cokecan.mat b/test/models-nonbsd/NFF/NFFSense8/cokecan.mat
similarity index 100%
rename from test/models/NFF/NFFSense8/cokecan.mat
rename to test/models-nonbsd/NFF/NFFSense8/cokecan.mat
diff --git a/test/models/NFF/NFFSense8/cokecan.nff b/test/models-nonbsd/NFF/NFFSense8/cokecan.nff
similarity index 100%
rename from test/models/NFF/NFFSense8/cokecan.nff
rename to test/models-nonbsd/NFF/NFFSense8/cokecan.nff
diff --git a/test/models/NFF/NFFSense8/credits.txt b/test/models-nonbsd/NFF/NFFSense8/credits.txt
similarity index 100%
rename from test/models/NFF/NFFSense8/credits.txt
rename to test/models-nonbsd/NFF/NFFSense8/credits.txt
diff --git a/test/models/NFF/NFFSense8/teapot.nff b/test/models-nonbsd/NFF/NFFSense8/teapot.nff
similarity index 100%
rename from test/models/NFF/NFFSense8/teapot.nff
rename to test/models-nonbsd/NFF/NFFSense8/teapot.nff
diff --git a/test/models/OBJ/rifle.mtl b/test/models-nonbsd/OBJ/rifle.mtl
similarity index 100%
rename from test/models/OBJ/rifle.mtl
rename to test/models-nonbsd/OBJ/rifle.mtl
diff --git a/test/models/OBJ/rifle.obj b/test/models-nonbsd/OBJ/rifle.obj
similarity index 100%
rename from test/models/OBJ/rifle.obj
rename to test/models-nonbsd/OBJ/rifle.obj
diff --git a/test/models/OBJ/rifle.source.txt b/test/models-nonbsd/OBJ/rifle.source.txt
similarity index 51%
rename from test/models/OBJ/rifle.source.txt
rename to test/models-nonbsd/OBJ/rifle.source.txt
index 1c4c14981..842a9cfc0 100644
--- a/test/models/OBJ/rifle.source.txt
+++ b/test/models-nonbsd/OBJ/rifle.source.txt
@@ -6,7 +6,7 @@ Model copyright: Elias Tsiantas
 =====================================================================
 
 Downloaded 4th November 2008 (Obama ftw!).
-Notice found on the page:
+Notices found on the page:
 
 "
 Free the models is a site that offers free 3d models in 3ds, bryce, poser,
@@ -17,6 +17,10 @@ sections such as wallpapers, 3d screensavers, 3d coding source code and
 tutorials.
 "
 
+"
+'Free the models' is a site dedicated to provide free content for 3d applications and 3d/game engines. The license of the content is that what you download from here is one step away from public domain. So, everything you download from here is free for any use EXCEPT it cannot be included in another free web or cd collection and it cannot be sold. Otherwise you can use it in your commercial game, 3d application or render work. You don't have to provide credit but It would be nice if you do.
+"
+
 INFO
 ====
 
diff --git a/test/models/OBJ/segment.mtl b/test/models-nonbsd/OBJ/segment.mtl
similarity index 100%
rename from test/models/OBJ/segment.mtl
rename to test/models-nonbsd/OBJ/segment.mtl
diff --git a/test/models/OBJ/segment.obj b/test/models-nonbsd/OBJ/segment.obj
similarity index 100%
rename from test/models/OBJ/segment.obj
rename to test/models-nonbsd/OBJ/segment.obj
diff --git a/test/models/OBJ/segment.source.txt b/test/models-nonbsd/OBJ/segment.source.txt
similarity index 100%
rename from test/models/OBJ/segment.source.txt
rename to test/models-nonbsd/OBJ/segment.source.txt
diff --git a/test/models/Ogre/Animationtest/Arm.skeleton.xml b/test/models-nonbsd/Ogre/Animationtest/Arm.skeleton.xml
similarity index 100%
rename from test/models/Ogre/Animationtest/Arm.skeleton.xml
rename to test/models-nonbsd/Ogre/Animationtest/Arm.skeleton.xml
diff --git a/test/models/Ogre/Animationtest/Cube.mesh.xml b/test/models-nonbsd/Ogre/Animationtest/Cube.mesh.xml
similarity index 100%
rename from test/models/Ogre/Animationtest/Cube.mesh.xml
rename to test/models-nonbsd/Ogre/Animationtest/Cube.mesh.xml
diff --git a/test/models/Ogre/Animationtest/Scene.material b/test/models-nonbsd/Ogre/Animationtest/Scene.material
similarity index 100%
rename from test/models/Ogre/Animationtest/Scene.material
rename to test/models-nonbsd/Ogre/Animationtest/Scene.material
diff --git a/test/models/Ogre/Assassine/Axt.mesh.xml b/test/models-nonbsd/Ogre/Assassine/Axt.mesh.xml
similarity index 100%
rename from test/models/Ogre/Assassine/Axt.mesh.xml
rename to test/models-nonbsd/Ogre/Assassine/Axt.mesh.xml
diff --git a/test/models/Ogre/Assassine/Axt.skeleton.xml b/test/models-nonbsd/Ogre/Assassine/Axt.skeleton.xml
similarity index 100%
rename from test/models/Ogre/Assassine/Axt.skeleton.xml
rename to test/models-nonbsd/Ogre/Assassine/Axt.skeleton.xml
diff --git a/test/models/Ogre/Assassine/DesertEagle.tga b/test/models-nonbsd/Ogre/Assassine/DesertEagle.tga
similarity index 100%
rename from test/models/Ogre/Assassine/DesertEagle.tga
rename to test/models-nonbsd/Ogre/Assassine/DesertEagle.tga
diff --git a/test/models/Ogre/Assassine/Koerper.mesh.xml b/test/models-nonbsd/Ogre/Assassine/Koerper.mesh.xml
similarity index 100%
rename from test/models/Ogre/Assassine/Koerper.mesh.xml
rename to test/models-nonbsd/Ogre/Assassine/Koerper.mesh.xml
diff --git a/test/models/Ogre/Assassine/Koerper.skeleton.xml b/test/models-nonbsd/Ogre/Assassine/Koerper.skeleton.xml
similarity index 100%
rename from test/models/Ogre/Assassine/Koerper.skeleton.xml
rename to test/models-nonbsd/Ogre/Assassine/Koerper.skeleton.xml
diff --git a/test/models/Ogre/Assassine/Pistol.mesh.xml b/test/models-nonbsd/Ogre/Assassine/Pistol.mesh.xml
similarity index 100%
rename from test/models/Ogre/Assassine/Pistol.mesh.xml
rename to test/models-nonbsd/Ogre/Assassine/Pistol.mesh.xml
diff --git a/test/models/Ogre/Assassine/Pistol.skeleton.xml b/test/models-nonbsd/Ogre/Assassine/Pistol.skeleton.xml
similarity index 100%
rename from test/models/Ogre/Assassine/Pistol.skeleton.xml
rename to test/models-nonbsd/Ogre/Assassine/Pistol.skeleton.xml
diff --git a/test/models/Ogre/Assassine/PlayerTextur.tga b/test/models-nonbsd/Ogre/Assassine/PlayerTextur.tga
similarity index 100%
rename from test/models/Ogre/Assassine/PlayerTextur.tga
rename to test/models-nonbsd/Ogre/Assassine/PlayerTextur.tga
diff --git a/test/models/Ogre/Assassine/Scene.material b/test/models-nonbsd/Ogre/Assassine/Scene.material
similarity index 100%
rename from test/models/Ogre/Assassine/Scene.material
rename to test/models-nonbsd/Ogre/Assassine/Scene.material
diff --git a/test/models/Ogre/Assassine/axt.tga b/test/models-nonbsd/Ogre/Assassine/axt.tga
similarity index 100%
rename from test/models/Ogre/Assassine/axt.tga
rename to test/models-nonbsd/Ogre/Assassine/axt.tga
diff --git a/test/models/Ogre/Gravestone/Sarg.material b/test/models-nonbsd/Ogre/Gravestone/Sarg.material
similarity index 100%
rename from test/models/Ogre/Gravestone/Sarg.material
rename to test/models-nonbsd/Ogre/Gravestone/Sarg.material
diff --git a/test/models/Ogre/Gravestone/Sarg.mesh.xml b/test/models-nonbsd/Ogre/Gravestone/Sarg.mesh.xml
similarity index 100%
rename from test/models/Ogre/Gravestone/Sarg.mesh.xml
rename to test/models-nonbsd/Ogre/Gravestone/Sarg.mesh.xml
diff --git a/test/models/Ogre/Gravestone/SargTextur.tga b/test/models-nonbsd/Ogre/Gravestone/SargTextur.tga
similarity index 100%
rename from test/models/Ogre/Gravestone/SargTextur.tga
rename to test/models-nonbsd/Ogre/Gravestone/SargTextur.tga
diff --git a/test/models/Ogre/animationtest2/Animationtest2.blend b/test/models-nonbsd/Ogre/animationtest2/Animationtest2.blend
similarity index 100%
rename from test/models/Ogre/animationtest2/Animationtest2.blend
rename to test/models-nonbsd/Ogre/animationtest2/Animationtest2.blend
diff --git a/test/models/Ogre/animationtest2/Animationtest2.blend1 b/test/models-nonbsd/Ogre/animationtest2/Animationtest2.blend1
similarity index 100%
rename from test/models/Ogre/animationtest2/Animationtest2.blend1
rename to test/models-nonbsd/Ogre/animationtest2/Animationtest2.blend1
diff --git a/test/models/Ogre/animationtest2/Cube.mesh.xml b/test/models-nonbsd/Ogre/animationtest2/Cube.mesh.xml
similarity index 100%
rename from test/models/Ogre/animationtest2/Cube.mesh.xml
rename to test/models-nonbsd/Ogre/animationtest2/Cube.mesh.xml
diff --git a/test/models/Ogre/animationtest2/Cube.skeleton.xml b/test/models-nonbsd/Ogre/animationtest2/Cube.skeleton.xml
similarity index 100%
rename from test/models/Ogre/animationtest2/Cube.skeleton.xml
rename to test/models-nonbsd/Ogre/animationtest2/Cube.skeleton.xml
diff --git a/test/models/Ogre/animationtest2/Scene.material b/test/models-nonbsd/Ogre/animationtest2/Scene.material
similarity index 100%
rename from test/models/Ogre/animationtest2/Scene.material
rename to test/models-nonbsd/Ogre/animationtest2/Scene.material
diff --git a/test/models/PK3/SGDTT3.pk3 b/test/models-nonbsd/PK3/SGDTT3.pk3
similarity index 100%
rename from test/models/PK3/SGDTT3.pk3
rename to test/models-nonbsd/PK3/SGDTT3.pk3
diff --git a/test/models-nonbsd/README.txt b/test/models-nonbsd/README.txt
new file mode 100644
index 000000000..a6842987b
--- /dev/null
+++ b/test/models-nonbsd/README.txt
@@ -0,0 +1,3 @@
+These models are not generally redistributable under the terms of Assimp's BSD license. Usually, an additional requirement on the use of the data is imposed (i.e. no commercial use, need credits, some creative commons variants, ...).
+
+So, if you re-package Assimp for use in a 'clean' OSS package, consider removing this directory.
\ No newline at end of file
diff --git a/test/models/X/axe.jpg b/test/models-nonbsd/X/axe.jpg
similarity index 100%
rename from test/models/X/axe.jpg
rename to test/models-nonbsd/X/axe.jpg
diff --git a/test/models/X/dwarf-Read-Me.txt b/test/models-nonbsd/X/dwarf-Read-Me.txt
similarity index 100%
rename from test/models/X/dwarf-Read-Me.txt
rename to test/models-nonbsd/X/dwarf-Read-Me.txt
diff --git a/test/models/X/dwarf.jpg b/test/models-nonbsd/X/dwarf.jpg
similarity index 100%
rename from test/models/X/dwarf.jpg
rename to test/models-nonbsd/X/dwarf.jpg
diff --git a/test/models/X/dwarf.x b/test/models-nonbsd/X/dwarf.x
similarity index 100%
rename from test/models/X/dwarf.x
rename to test/models-nonbsd/X/dwarf.x
diff --git a/test/models/ASE/MotionCaptureROM.source.txt b/test/models/ASE/MotionCaptureROM.source.txt
index 5fdb5a637..72542af41 100644
--- a/test/models/ASE/MotionCaptureROM.source.txt
+++ b/test/models/ASE/MotionCaptureROM.source.txt
@@ -1,3 +1,3 @@
-"MotionCaptureROM.ase" - Recorded using Vicon IQ. 
+"MotionCaptureROM.ase" - Free for any purpose. 
 
-NOTE: The errors in the middle of the animation are caused by problems during recording.
\ No newline at end of file
+NOTE: The errors in the middle of the animation are caused by problems during recording, it's not an importer issue.
\ No newline at end of file
diff --git a/test/models/BLEND/HUMAN.source.txt b/test/models/BLEND/HUMAN.source.txt
index 040c262ff..4cb20c906 100644
--- a/test/models/BLEND/HUMAN.source.txt
+++ b/test/models/BLEND/HUMAN.source.txt
@@ -1,3 +1,3 @@
 HUMAN.blend (c) 2010, Tobias Rittig
 
-Redistribution and reuse allowed, credits appreciated.
\ No newline at end of file
+Redistribution and reuse allowed for any purpose, credits appreciated.
\ No newline at end of file
diff --git a/test/regression/db.zip b/test/regression/db.zip
index 8c48b7918..0bb13cf5b 100644
Binary files a/test/regression/db.zip and b/test/regression/db.zip differ
diff --git a/test/regression/settings.py b/test/regression/settings.py
index 8acf754e1..53ec6bbc8 100644
--- a/test/regression/settings.py
+++ b/test/regression/settings.py
@@ -86,7 +86,8 @@ database_name = "db"
 # List of directories to be processed. Paths are processed recursively.
 # -------------------------------------------------------------------------------
 model_directories = [
-os.path.join("..","models")
+os.path.join("..","models"),
+os.path.join("..","models-nonbsd")
 ]
 
 # -------------------------------------------------------------------------------
diff --git a/test/unit/utImporter.cpp b/test/unit/utImporter.cpp
index 90cd5c754..e4ed03633 100644
--- a/test/unit/utImporter.cpp
+++ b/test/unit/utImporter.cpp
@@ -195,12 +195,12 @@ void  ImporterTest :: testMultipleReads (void)
 		aiProcess_OptimizeGraph;
 
 	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/test.x",flags));
-	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags));
+	//CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags)); # is in nonbsd
 	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/Testwuson.x",flags));
 	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/anim_test.x",flags));
-	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags));
+	//CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags)); # is in nonbsd
 
 	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/anim_test.x",flags));
 	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/bcn_epileptic.x",flags));
-	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags));
+	//CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags)); # is in nonbsd
 }
diff --git a/workspaces/vc9/assimp.sln b/workspaces/vc9/assimp.sln
index 5d7d0be04..d797e6a88 100644
--- a/workspaces/vc9/assimp.sln
+++ b/workspaces/vc9/assimp.sln
@@ -107,6 +107,7 @@ Global
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug|x64.Build.0 = debug|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-dll|Win32.ActiveCfg = debug-dll|Win32
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-dll|x64.ActiveCfg = debug-dll|x64
+		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-dll|x64.Build.0 = debug-dll|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-noboost-st|Win32.ActiveCfg = debug-noboost-st|Win32
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-noboost-st|Win32.Build.0 = debug-noboost-st|Win32
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-noboost-st|x64.ActiveCfg = debug-noboost-st|x64
@@ -136,26 +137,32 @@ Global
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug|x64.ActiveCfg = Debug|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|Win32.ActiveCfg = debug-dll|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|Win32.Build.0 = debug-dll|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|x64.ActiveCfg = debug-dll|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|x64.ActiveCfg = debug-dll|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|x64.Build.0 = debug-dll|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-noboost-st|Win32.ActiveCfg = debug-noboost-st|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-noboost-st|Win32.Build.0 = debug-noboost-st|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-noboost-st|x64.ActiveCfg = debug-noboost-st|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-noboost-st|x64.ActiveCfg = debug-noboost-st|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-noboost-st|x64.Build.0 = debug-noboost-st|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-st|Win32.ActiveCfg = debug-st|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-st|Win32.Build.0 = debug-st|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-st|x64.ActiveCfg = debug-st|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-st|x64.ActiveCfg = debug-st|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-st|x64.Build.0 = debug-st|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release|Win32.ActiveCfg = Release|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release|Win32.Build.0 = Release|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release|x64.ActiveCfg = Release|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release|x64.ActiveCfg = Release|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release|x64.Build.0 = Release|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-dll|Win32.ActiveCfg = release-dll|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-dll|Win32.Build.0 = release-dll|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-dll|x64.ActiveCfg = release-dll|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-dll|x64.Build.0 = release-dll|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-noboost-st|Win32.ActiveCfg = release-noboost-st|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-noboost-st|Win32.Build.0 = release-noboost-st|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-noboost-st|x64.ActiveCfg = release-noboost-st|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-noboost-st|x64.ActiveCfg = release-noboost-st|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-noboost-st|x64.Build.0 = release-noboost-st|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-st|Win32.ActiveCfg = release-st|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-st|Win32.Build.0 = release-st|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-st|x64.ActiveCfg = release-st|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-st|x64.ActiveCfg = release-st|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-st|x64.Build.0 = release-st|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE