diff --git a/.gitignore b/.gitignore
index 03f2c6308..6a6769412 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.pyc
 *.*~
-*.log
\ No newline at end of file
+*.log
+\#*\#
diff --git a/openlp/core/test/test_plugin_manager.py b/openlp/core/test/test_plugin_manager.py
index a92938b23..2d16484cd 100644
--- a/openlp/core/test/test_plugin_manager.py
+++ b/openlp/core/test/test_plugin_manager.py
@@ -18,22 +18,25 @@ import os, sys
 mypath=os.path.split(os.path.abspath(__file__))[0]
 
 sys.path.insert(0,(os.path.join(mypath, '..' ,'..', '..')))
-from openlp.plugins.plugin_manager import PluginManager
+from openlp.core.pluginmanager import PluginManager
 
+# test the plugin manager with some plugins in the test_plugins directory
 class TestPluginManager:
     def test_init(self):
-        p=PluginManager("..")
+        p=PluginManager("./testplugins")
         assert (len(p.plugins)==2);
         # get list of the names of the plugins
         names=[plugin.name for plugin in p.plugins]
+        # see which ones we've got
         assert ("testplugin1" in names)
         assert ("testplugin2" in names)
+        # and not got!
         assert ("testplugin3" not in names)
-        assert (p.plugin_by_name["testplugin1"].version==0)
-        assert (p.plugin_by_name["testplugin2"].version==1)
-            
+        # test that the weighting is done right
+        assert p.plugins[0].name=="testplugin2"
+        assert p.plugins[1].name=="testplugin1"
 if __name__=="__main__":
     log.debug("Starting")
-    p=PluginManager("..")
+    p=PluginManager("./testplugins")
     for plugin in p.plugins:
         log.debug("Plugin %s, name=%s (version=%d)"%(str(plugin), plugin.name, plugin.version))
diff --git a/openlp/plugins/testplugin1.py b/openlp/core/test/testplugins/testplugin1.py
similarity index 80%
rename from openlp/plugins/testplugin1.py
rename to openlp/core/test/testplugins/testplugin1.py
index 991e88291..c681e00d2 100644
--- a/openlp/plugins/testplugin1.py
+++ b/openlp/core/test/testplugins/testplugin1.py
@@ -1,4 +1,4 @@
-from openlp.plugins import Plugin
+from openlp.core.lib import Plugin
 import logging
 
 class testplugin1(Plugin):
@@ -7,6 +7,7 @@ class testplugin1(Plugin):
     global log
     log=logging.getLogger("testplugin1")
     log.info("Started")
+    Weight=10
     def __init__(self):
         pass
         
diff --git a/openlp/plugins/testplugin2/__init__.py b/openlp/core/test/testplugins/testplugin2/__init__.py
similarity index 100%
rename from openlp/plugins/testplugin2/__init__.py
rename to openlp/core/test/testplugins/testplugin2/__init__.py
diff --git a/openlp/plugins/testplugin2/testplugin2.py b/openlp/core/test/testplugins/testplugin2/testplugin2.py
similarity index 68%
rename from openlp/plugins/testplugin2/testplugin2.py
rename to openlp/core/test/testplugins/testplugin2/testplugin2.py
index 0df5d2ecc..4956d80d3 100644
--- a/openlp/plugins/testplugin2/testplugin2.py
+++ b/openlp/core/test/testplugins/testplugin2/testplugin2.py
@@ -1,7 +1,8 @@
-from openlp.plugins import Plugin
+from openlp.core.lib import Plugin
 
 class testplugin2(Plugin):
     name="testplugin2"
     version=1
+    Weight=1
     def __init__(self):
         pass