diff --git a/other/tests_needing_cleanup/nico_ui.py b/other/tests_needing_cleanup/nico_ui.py
deleted file mode 100644
index 8ce98043..00000000
--- a/other/tests_needing_cleanup/nico_ui.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# 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 subprocess
-import unittest
-
-cdist_commands=["banner", "config", "install"]
-
-cdist_exec_path = os.path.abspath(
-    os.path.join(os.path.dirname(os.path.realpath(__file__)), "../bin/cdist"))
-
-class UI(unittest.TestCase):
-    def test_banner(self):
-        self.assertEqual(subprocess.call([cdist_exec_path, "banner"]), 0)
-
-    def test_help(self):
-        for cmd in cdist_commands:
-            self.assertEqual(subprocess.call([cdist_exec_path, cmd, "-h"]), 0)
-
-    # FIXME: mockup needed
-    def test_config_localhost(self):
-        for cmd in cdist_commands:
-            self.assertEqual(subprocess.call([cdist_exec_path, "config", "localhost"]), 0)
-
diff --git a/other/tests_needing_cleanup/test_config.py b/other/tests_needing_cleanup/test_config.py
deleted file mode 100644
index 0632ebcc..00000000
--- a/other/tests_needing_cleanup/test_config.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# 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 sys
-import tempfile
-import unittest
-
-sys.path.insert(0, os.path.abspath(
-        os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
-
-import cdist.config
-
-cdist_exec_path = os.path.abspath(
-    os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin/cdist"))
-
-
-class Config(unittest.TestCase):
-    def setUp(self):
-        self.temp_dir = tempfile.mkdtemp()
-        self.init_manifest = os.path.join(self.temp_dir, "manifest")
-        self.config = cdist.config.Config("localhost",
-                            initial_manifest=self.init_manifest,
-                            exec_path=cdist_exec_path)
-        self.config.link_emulator()
-
-    def test_initial_manifest_different_parameter(self):
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "__file " + self.temp_dir + " --mode 0700\n",
-            "__file " + self.temp_dir + " --mode 0600\n",
-            ])
-        manifest_fd.close()
-
-        self.assertRaises(cdist.Error, self.config.run_initial_manifest)
-
-    def test_initial_manifest_parameter_added(self):
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "__file " + self.temp_dir + '\n',
-            "__file " + self.temp_dir + " --mode 0600\n",
-            ])
-        manifest_fd.close()
-
-        self.assertRaises(cdist.Error, self.config.run_initial_manifest)
-
-    def test_initial_manifest_parameter_removed(self):
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "__file " + self.temp_dir + " --mode 0600\n",
-            "__file " + self.temp_dir + "\n",
-            ])
-        manifest_fd.close()
-
-        self.assertRaises(cdist.Error, self.config.run_initial_manifest)
-
-    def test_initial_manifest_non_existent_command(self):
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "thereisdefinitelynosuchcommend"])
-        manifest_fd.close()
-
-        self.assertRaises(cdist.Error, self.config.run_initial_manifest)
-
-    def test_initial_manifest_parameter_twice(self):
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "__file " + self.temp_dir + " --mode 0600\n",
-            "__file " + self.temp_dir + " --mode 0600\n",
-            ])
-        manifest_fd.close()
-
-        try:
-            self.config.run_initial_manifest()
-        except cdist.Error:
-            failed = True
-        else:
-            failed = False
-
-        self.assertFalse(failed)
-
-
diff --git a/other/tests_needing_cleanup/test_install.py b/other/tests_needing_cleanup/test_install.py
deleted file mode 100644
index d6502b46..00000000
--- a/other/tests_needing_cleanup/test_install.py
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# 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 sys
-import tempfile
-import unittest
-
-sys.path.insert(0, os.path.abspath(
-        os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
-
-import cdist.config
-import cdist.test
-
-class Install(unittest.TestCase):
-    def setUp(self):
-        self.temp_dir = tempfile.mkdtemp()
-        self.init_manifest = os.path.join(self.temp_dir, "manifest")
-
-        os.environ['__remote_exec'] = "ssh -o User=root -q"
-        os.environ['__remote_copy'] = "scp -o User=root -q"
-
-        self.config = cdist.config.Config("localhost",
-                            initial_manifest=self.init_manifest,
-                            exec_path=cdist.test.cdist_exec_path)
-        self.config.link_emulator()
-
-
-### NEW FOR INSTALL ############################################################
-
-    def test_explorer_ran(self):
-        """Check that all explorers returned a result"""
-        self.config.run_global_explores()
-        explorers = self.config.path.list_global_explorers()
-
-        for explorer in explorers:
-            output = self.config.path.global_explorer_output_path(explorer)
-            self.assertTrue(os.path.isfile(output))
-
-    def test_manifest_uses_install_types_only(self):
-        """Check that objects created from manifest are only of install type"""
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "__file " + self.temp_dir + " --mode 0700\n",
-            "__partition_msdos /dev/null --type 82\n",
-            ])
-        manifest_fd.close()
-
-        self.config.run_initial_manifest()
-
-        # FIXME: check that only __partition_msdos objects are created!
-
-        self.assertFalse(failed)
-
-
-### OLD FROM CONFIG ############################################################
-    def test_initial_manifest_different_parameter(self):
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "__file " + self.temp_dir + " --mode 0700\n",
-            "__file " + self.temp_dir + " --mode 0600\n",
-            ])
-        manifest_fd.close()
-
-        self.assertRaises(cdist.Error, self.config.run_initial_manifest)
-
-    def test_initial_manifest_parameter_added(self):
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "__file " + self.temp_dir + '\n',
-            "__file " + self.temp_dir + " --mode 0600\n",
-            ])
-        manifest_fd.close()
-
-        self.assertRaises(cdist.Error, self.config.run_initial_manifest)
-
-    def test_initial_manifest_parameter_removed(self):
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "__file " + self.temp_dir + " --mode 0600\n",
-            "__file " + self.temp_dir + "\n",
-            ])
-        manifest_fd.close()
-
-        self.assertRaises(cdist.Error, self.config.run_initial_manifest)
-
-    def test_initial_manifest_non_existent_command(self):
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "thereisdefinitelynosuchcommend"])
-        manifest_fd.close()
-
-        self.assertRaises(cdist.Error, self.config.run_initial_manifest)
-
-    def test_initial_manifest_parameter_twice(self):
-        manifest_fd = open(self.init_manifest, "w")
-        manifest_fd.writelines(["#!/bin/sh\n",
-            "__file " + self.temp_dir + " --mode 0600\n",
-            "__file " + self.temp_dir + " --mode 0600\n",
-            ])
-        manifest_fd.close()
-
-        try:
-            self.config.run_initial_manifest()
-        except cdist.Error:
-            failed = True
-        else:
-            failed = False
-
-        self.assertFalse(failed)
-
-