diff --git a/openlp/plugins/songs/lib/test.opensong b/openlp/plugins/songs/lib/test.opensong
deleted file mode 100644
index af0f039ed..000000000
--- a/openlp/plugins/songs/lib/test.opensong
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<song>
-  <title>Martins Test</title>
-  <author>MartiÑ Thómpson</author>
-  <copyright>2010 Martin Thompson</copyright>
-  <hymn_number>1</hymn_number>
-  <presentation>V1 C V2 C2 V3 B1 V1</presentation>
-  <ccli>Blah</ccli>
-  <capo print="false"></capo>
-  <key></key>
-  <aka></aka>
-  <key_line></key_line>
-  <user1></user1>
-  <user2></user2>
-  <user3></user3>
-  <theme></theme>
-  <tempo></tempo>
-  <time_sig></time_sig>
-  <lyrics>;Comment
-. A   B C
-1 v1 Line 1___
-2 v2 Line 1___
-. A B C7
-1 V1 Line 2
-2 V2 Line 2
- 
-[3]
- V3 Line 1
- V3 Line 2
-
-[b1]
- Bridge 1
- Bridge 1 line 2
-[C]
-. A     B
- Chorus 1
- 
-[C2]
-.  A    B
- Chorus 2
- </lyrics>
-  <style index="default_style">
-  <title enabled="true" valign="bottom" align="center" include_verse="false" margin-left="0" margin-right="0" margin-top="0" margin-bottom="0" font="Helvetica" size="26" bold="true" italic="true" underline="false" color="#FFFFFF" border="true" border_color="#000000" shadow="true" shadow_color="#000000" fill="false" fill_color="#000000"/>
-  <subtitle enabled="true" valign="bottom" align="center" descriptive="false" margin-left="0" margin-right="0" margin-top="0" margin-bottom="0" font="Helvetica" size="18" bold="true" italic="true" underline="false" color="#FFFFFF" border="true" border_color="#000000" shadow="true" shadow_color="#000000" fill="false" fill_color="#000000"/>
-  <song_subtitle>author</song_subtitle>
-  <body enabled="true" auto_scale="false" valign="middle" align="center" highlight_chorus="true" margin-left="0" margin-right="0" margin-top="0" margin-bottom="0" font="Helvetica" size="34" bold="true" italic="false" underline="false" color="#FFFFFF" border="true" border_color="#000000" shadow="true" shadow_color="#000000" fill="false" fill_color="#FF0000">
-  <tabs/>
-</body>
-  <background strip_footer="0" color="#408080" position="1"/>
-</style></song>
diff --git a/openlp/plugins/songs/lib/test2.opensong b/openlp/plugins/songs/lib/test/test2.opensong
similarity index 100%
rename from openlp/plugins/songs/lib/test2.opensong
rename to openlp/plugins/songs/lib/test/test2.opensong
diff --git a/openlp/plugins/songs/lib/test_importing_lots.py b/openlp/plugins/songs/lib/test/test_importing_lots.py
similarity index 93%
rename from openlp/plugins/songs/lib/test_importing_lots.py
rename to openlp/plugins/songs/lib/test/test_importing_lots.py
index 5161f4a30..59d72b34b 100644
--- a/openlp/plugins/songs/lib/test_importing_lots.py
+++ b/openlp/plugins/songs/lib/test/test_importing_lots.py
@@ -9,9 +9,10 @@ import codecs
 def opensong_import_lots():
     ziploc=u'/home/mjt/openlp/OpenSong_Data/'
     files=[]
+    files=['test.opensong.zip']
 #    files.extend(glob(ziploc+u'Songs.zip'))
 #    files.extend(glob(ziploc+u'SOF.zip'))
-    files.extend(glob(ziploc+u'spanish_songs_for_opensong.zip'))
+    # files.extend(glob(ziploc+u'spanish_songs_for_opensong.zip'))
 #    files.extend(glob(ziploc+u'opensong_*.zip'))
     errfile=codecs.open(u'import_lots_errors.txt', u'w', u'utf8')
     manager=SongManager()
@@ -32,6 +33,7 @@ def opensong_import_lots():
             o=OpenSongImport(manager)
             try:
                 o.do_import_file(songfile)
+                o.song.print_song()
             except:
                 print "Failure",
                 
diff --git a/openlp/plugins/songs/lib/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py
similarity index 100%
rename from openlp/plugins/songs/lib/test_opensongimport.py
rename to openlp/plugins/songs/lib/test/test_opensongimport.py
