diff --git a/lib/cdist/test/type/__init__.py b/lib/cdist/test/type/__init__.py
index e69de29b..5ba1f4b9 100644
--- a/lib/cdist/test/type/__init__.py
+++ b/lib/cdist/test/type/__init__.py
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+#
+# 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+import os
+import unittest
+
+import cdist.core
+
+import os.path as op
+my_dir = op.abspath(op.dirname(__file__))
+fixtures = op.join(my_dir, 'fixtures')
+
+
+class TypeTestCase(unittest.TestCase):
+
+    def test_list_type_names(self):
+        base_path = op.join(fixtures, 'list_types')
+        type_names = cdist.core.Type.list_type_names(base_path)
+        self.assertEqual(type_names, ['__first', '__second', '__third'])
+
+    def test_list_types(self):
+        base_path = op.join(fixtures, 'list_types')
+        types = list(cdist.core.Type.list_types(base_path))
+        types_expected = [
+            cdist.core.Type(base_path, '__first'),
+            cdist.core.Type(base_path, '__second'),
+            cdist.core.Type(base_path, '__third'),
+        ]
+        self.assertEqual(types, types_expected)
+
+    def test_only_one_instance(self):
+        base_path = fixtures
+        cdist_type1 = cdist.core.Type(base_path, '__name_path')
+        cdist_type2 = cdist.core.Type(base_path, '__name_path')
+        self.assertEqual(id(cdist_type1), id(cdist_type2))
+
+    def test_name(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__name_path')
+        self.assertEqual(cdist_type.name, '__name_path')
+
+    def test_path(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__name_path')
+        self.assertEqual(cdist_type.path, '__name_path')
+
+    def test_absolute_path(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__name_path')
+        self.assertEqual(cdist_type.absolute_path, os.path.join(base_path, '__name_path'))
+
+    def test_manifest_path(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__name_path')
+        self.assertEqual(cdist_type.manifest_path, os.path.join('__name_path', 'manifest'))
+
+    def test_explorer_path(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__name_path')
+        self.assertEqual(cdist_type.explorer_path, os.path.join('__name_path', 'explorer'))
+
+    def test_gencode_local_path(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__name_path')
+        self.assertEqual(cdist_type.gencode_local_path, os.path.join('__name_path', 'gencode-local'))
+
+    def test_gencode_remote_path(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__name_path')
+        self.assertEqual(cdist_type.gencode_remote_path, os.path.join('__name_path', 'gencode-remote'))
+
+    def test_singleton_is_singleton(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__singleton')
+        self.assertTrue(cdist_type.is_singleton)
+
+    def test_not_singleton_is_singleton(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__not_singleton')
+        self.assertFalse(cdist_type.is_singleton)
+
+    def test_install_is_install(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__install')
+        self.assertTrue(cdist_type.is_install)
+
+    def test_not_install_is_install(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__not_install')
+        self.assertFalse(cdist_type.is_install)
+
+    def test_with_explorers(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__with_explorers')
+        self.assertEqual(cdist_type.explorers, ['whatever'])
+
+    def test_without_explorers(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__without_explorers')
+        self.assertEqual(cdist_type.explorers, [])
+
+    def test_with_required_parameters(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__with_required_parameters')
+        self.assertEqual(cdist_type.required_parameters, ['required1', 'required2'])
+
+    def test_without_required_parameters(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__without_required_parameters')
+        self.assertEqual(cdist_type.required_parameters, [])
+
+    def test_with_optional_parameters(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__with_optional_parameters')
+        self.assertEqual(cdist_type.optional_parameters, ['optional1', 'optional2'])
+
+    def test_without_optional_parameters(self):
+        base_path = fixtures
+        cdist_type = cdist.core.Type(base_path, '__without_optional_parameters')
+        self.assertEqual(cdist_type.optional_parameters, [])
+
+'''
+suite = unittest.TestLoader().loadTestsFromTestCase(ObjectTestCase)
+
+def suite():
+    tests = []
+    return unittest.TestSuite(map(ObjectTestCase, tests))
+'''
diff --git a/lib/cdist/test/type/test_type.py b/lib/cdist/test/type/test_type.py
deleted file mode 100644
index 5ba1f4b9..00000000
--- a/lib/cdist/test/type/test_type.py
+++ /dev/null
@@ -1,146 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-import os
-import unittest
-
-import cdist.core
-
-import os.path as op
-my_dir = op.abspath(op.dirname(__file__))
-fixtures = op.join(my_dir, 'fixtures')
-
-
-class TypeTestCase(unittest.TestCase):
-
-    def test_list_type_names(self):
-        base_path = op.join(fixtures, 'list_types')
-        type_names = cdist.core.Type.list_type_names(base_path)
-        self.assertEqual(type_names, ['__first', '__second', '__third'])
-
-    def test_list_types(self):
-        base_path = op.join(fixtures, 'list_types')
-        types = list(cdist.core.Type.list_types(base_path))
-        types_expected = [
-            cdist.core.Type(base_path, '__first'),
-            cdist.core.Type(base_path, '__second'),
-            cdist.core.Type(base_path, '__third'),
-        ]
-        self.assertEqual(types, types_expected)
-
-    def test_only_one_instance(self):
-        base_path = fixtures
-        cdist_type1 = cdist.core.Type(base_path, '__name_path')
-        cdist_type2 = cdist.core.Type(base_path, '__name_path')
-        self.assertEqual(id(cdist_type1), id(cdist_type2))
-
-    def test_name(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__name_path')
-        self.assertEqual(cdist_type.name, '__name_path')
-
-    def test_path(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__name_path')
-        self.assertEqual(cdist_type.path, '__name_path')
-
-    def test_absolute_path(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__name_path')
-        self.assertEqual(cdist_type.absolute_path, os.path.join(base_path, '__name_path'))
-
-    def test_manifest_path(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__name_path')
-        self.assertEqual(cdist_type.manifest_path, os.path.join('__name_path', 'manifest'))
-
-    def test_explorer_path(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__name_path')
-        self.assertEqual(cdist_type.explorer_path, os.path.join('__name_path', 'explorer'))
-
-    def test_gencode_local_path(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__name_path')
-        self.assertEqual(cdist_type.gencode_local_path, os.path.join('__name_path', 'gencode-local'))
-
-    def test_gencode_remote_path(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__name_path')
-        self.assertEqual(cdist_type.gencode_remote_path, os.path.join('__name_path', 'gencode-remote'))
-
-    def test_singleton_is_singleton(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__singleton')
-        self.assertTrue(cdist_type.is_singleton)
-
-    def test_not_singleton_is_singleton(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__not_singleton')
-        self.assertFalse(cdist_type.is_singleton)
-
-    def test_install_is_install(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__install')
-        self.assertTrue(cdist_type.is_install)
-
-    def test_not_install_is_install(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__not_install')
-        self.assertFalse(cdist_type.is_install)
-
-    def test_with_explorers(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__with_explorers')
-        self.assertEqual(cdist_type.explorers, ['whatever'])
-
-    def test_without_explorers(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__without_explorers')
-        self.assertEqual(cdist_type.explorers, [])
-
-    def test_with_required_parameters(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__with_required_parameters')
-        self.assertEqual(cdist_type.required_parameters, ['required1', 'required2'])
-
-    def test_without_required_parameters(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__without_required_parameters')
-        self.assertEqual(cdist_type.required_parameters, [])
-
-    def test_with_optional_parameters(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__with_optional_parameters')
-        self.assertEqual(cdist_type.optional_parameters, ['optional1', 'optional2'])
-
-    def test_without_optional_parameters(self):
-        base_path = fixtures
-        cdist_type = cdist.core.Type(base_path, '__without_optional_parameters')
-        self.assertEqual(cdist_type.optional_parameters, [])
-
-'''
-suite = unittest.TestLoader().loadTestsFromTestCase(ObjectTestCase)
-
-def suite():
-    tests = []
-    return unittest.TestSuite(map(ObjectTestCase, tests))
-'''