--- a/API/Factories/AbstractNativeWarFoundryFactoryTest.cs	Mon Apr 16 20:45:45 2012 +0100
+++ b/API/Factories/AbstractNativeWarFoundryFactoryTest.cs	Sat Jul 07 21:02:53 2012 +0100
@@ -9,6 +9,7 @@
 using System.IO;
 using IBBoard.WarFoundry.API.Objects;
 using System.Collections.Generic;
+using IBBoard.WarFoundry.API.Loading;
 
 namespace IBBoard.WarFoundry.API.Factories
 {
@@ -20,12 +21,12 @@
 		{
 			MockNativeWarFoundryFactory factory = new MockNativeWarFoundryFactory();
 			Stopwatch sw = Stopwatch.StartNew();
-			factory.CreateObjectsFromFile(new FileInfo("testdata/Test.race"));
+			factory.CreateObjectsFromFile(new LoadableFileObject("testdata/Test.race"));
 			sw.Stop();
 			long successElapsed = sw.ElapsedMilliseconds;
 			sw.Reset();
 			sw.Start();
-			factory.CreateObjectsFromFile(new FileInfo("testdata/NotARaceFile.txt"));
+			factory.CreateObjectsFromFile(new LoadableFileObject("testdata/NotARaceFile.txt"));
 			sw.Stop();
 			long failedElapsed = sw.ElapsedMilliseconds;
 			long timeRatio = failedElapsed / successElapsed;
@@ -39,7 +40,7 @@
 			//This will also be triggered by Bug94TestLoadingTimesForNonZipFiles, but this makes it separate and explicit
 			FileInfo nonRaceFile = new FileInfo("testdata/NotARaceFile.txt");
 			Assert.That(nonRaceFile.Exists, Is.True);
-			Assert.That(factory.CanHandleFileFormat(nonRaceFile), Is.False);
+			Assert.That(factory.CanHandleFileFormat(new LoadableFileObject(nonRaceFile)), Is.False);
 		}
 
 		[Test]
@@ -50,7 +51,7 @@
 			Assert.That(factory.GetGameSystemZipEntries(file), Has.Count(3));
 			Assert.That(factory.GetRaceZipEntries(file), Has.Count(3));
 			Assert.That(factory.GetArmyZipEntries(file), Has.Count(3));
-			ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(file);
+			ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableFileObject(file));
 			Assert.That(objs, Has.Count(0));
 		}
 	}