--- a/WarFoundryLoaderTest.cs	Sat Mar 14 17:11:13 2009 +0000
+++ b/WarFoundryLoaderTest.cs	Sun Mar 15 15:21:58 2009 +0000
@@ -6,13 +6,14 @@
 using System.IO;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects;
+using IBBoard.WarFoundry.API.Factories.Xml;
 
 namespace IBBoard.WarFoundry.API.Factories
 {
 	[TestFixture()]
 	public class WarFoundryLoaderTest
 	{
-		private AbstractNativeWarFoundryFactory factory;
+		private AbstractNativeWarFoundryFactory sysFactory;
 				
 		[Test()]
 		public void TestLoadWithoutFactoriesCompletesWithoutError()
@@ -23,34 +24,24 @@
 		[Test()]
 		public void TestLoadingSystemCompletesWithoutError()
 		{
-			WarFoundryLoader loader = GetSystemLoader();
-			DirectoryInfo dir = new DirectoryInfo(".");
-			loader.RegisterFactory(GetFactory());
+			WarFoundryLoader loader = WarFoundryLoader.GetDefault();
+			DirectoryInfo dir = new DirectoryInfo("testdata");
+			loader.RegisterFactory(GetSystemFactory());
 			loader.AddLoadDirectory(dir);
 			loader.LoadFiles();
 			Assert.Greater(loader.GetGameSystems().Length, 0);
 			loader.RemoveLoadDirectory(dir);
-			loader.UnregisterFactory(GetFactory());
+			loader.UnregisterFactory(GetSystemFactory());
 		}
 				
-		private AbstractNativeWarFoundryFactory GetFactory()
+		private AbstractNativeWarFoundryFactory GetSystemFactory()
 		{
-			if (factory == null)
+			if (sysFactory == null)
 			{
-				factory = new MockFactory();
+				sysFactory = new MockSystemFactory();
 			}
 			
-			return factory;
-		}
-		
-		private WarFoundryLoader GetSystemLoader()
-		{
-			return new FixedFileWarFoundryLoader(new MockSystemZipFile());
-		}
-		
-		private WarFoundryLoader GetRaceLoader()
-		{
-			return new FixedFileWarFoundryLoader(new MockRaceZipFile());
+			return sysFactory;
 		}
 	}
 }