diff --git a/RIGS/importer.py b/RIGS/importer.py
index 01f1989e..b14c9405 100644
--- a/RIGS/importer.py
+++ b/RIGS/importer.py
@@ -14,6 +14,13 @@ from RIGS import models
 import reversion
 from datetime import datetime
 
+
+def fix_email(email):
+    if not (email is None or email is "") and ("@" not in email):
+        email += "@nottingham.ac.uk"
+    return email
+
+
 def setup_cursor():
     try:
         cursor = connections['legacy'].cursor()
@@ -63,8 +70,7 @@ def import_people(delete=False):
     resp = cursor.fetchall()
     for row in resp:
         email = row[3]
-        if (email is not None) and ("@" not in email):
-            email += "@nottingham.ac.uk"
+        fix_email(email)
 
         notes = ""
         if row[5] != "Normal":
@@ -256,14 +262,14 @@ def import_nonrigs(delete=False):
             event.save()
 
 def main():
-    # import_users()
-    # import_people()
-    # import_organisations()
-    # import_vat_rates()
-    # import_venues(True)
-    # import_rigs(False)
-    # import_eventitem(True)
-    import_nonrigs(True)
+    import_users()
+    import_people()
+    import_organisations()
+    import_vat_rates()
+    import_venues(False)
+    import_rigs(False)
+    import_eventitem(False)
+    import_nonrigs(False)
 
 
 if __name__ == "__main__":
diff --git a/RIGS/importer_tests.py b/RIGS/importer_tests.py
new file mode 100644
index 00000000..36485f25
--- /dev/null
+++ b/RIGS/importer_tests.py
@@ -0,0 +1,28 @@
+__author__ = 'ghost'
+
+import unittest
+from importer import fix_email
+
+
+class EmailFixerTest(unittest.TestCase):
+    def test_correct(self):
+        e = fix_email("tom@ghost.uk.net")
+        self.assertEqual(e, "tom@ghost.uk.net")
+
+    def test_partial(self):
+        e = fix_email("psytp")
+        self.assertEqual(e, "psytp@nottingham.ac.uk")
+
+    def test_none(self):
+        old = None
+        new = fix_email(old)
+        self.assertEqual(old, new)
+
+    def test_empty(self):
+        old = ""
+        new = fix_email(old)
+        self.assertEqual(old, new)
+
+
+if __name__ == '__main__':
+    unittest.main()