diff --git a/README b/README
index aab4c3a5..3dff690f 100644
--- a/README
+++ b/README
@@ -115,6 +115,13 @@ If you want to ensure nothing breaks you must set back the python version to wha
     eselect python list
     eselect python list set python3.2
 
+#### Max OS X
+
+Ensure you have port installed and configured (http://www.macports.org/install.php).
+
+    port install python32
+    ln -s /opt/local/bin/python3.2 /opt/local/bin/python3
+
 ### Get cdist
 
 You can clone cdist from git, which gives you the advantage of having
diff --git a/build.sh b/build.sh
index d20e0211..021fb480 100755
--- a/build.sh
+++ b/build.sh
@@ -126,6 +126,14 @@ case "$1" in
       | xargs rm -f
    ;;
 
+   test)
+      python3 -m unittest discover test 'test_*.py' 
+   ;;
+
+   test-all)
+      python3 -m unittest discover test '*.py' 
+   ;;
+
    *)
       echo ''
       echo 'Welcome to cdist!'
diff --git a/conf/type/__user/gencode-remote b/conf/type/__user/gencode-remote
index 31c93655..c4f9123a 100755
--- a/conf/type/__user/gencode-remote
+++ b/conf/type/__user/gencode-remote
@@ -55,7 +55,7 @@ if grep -q "^${name}:" "$__object/explorer/passwd"; then
       current_value="$(awk -F: '{ print $ENVIRON["field"] }' < "$file")"
 
       if [ "$new_value" != "$current_value" ]; then
-         set -- "$@" "--$property" \"$new_value\"
+         set -- "$@" "--$property" \'$new_value\'
       fi
    done
 
@@ -67,7 +67,7 @@ if grep -q "^${name}:" "$__object/explorer/passwd"; then
 else
    for property in $(ls .); do
       new_value="$(cat "$property")"
-      set -- "$@" "--$property" \"$new_value\"
+      set -- "$@" "--$property" \'$new_value\'
    done
 
    echo useradd "$@" "$name"
diff --git a/test/nico_ui.py b/test/nico_ui.py
new file mode 100755
index 00000000..8ce98043
--- /dev/null
+++ b/test/nico_ui.py
@@ -0,0 +1,45 @@
+#!/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/test.py b/test/test_config.py
old mode 100755
new mode 100644
similarity index 62%
rename from test.py
rename to test/test_config.py
index 5d57fae4..0632ebcc
--- a/test.py
+++ b/test/test_config.py
@@ -20,71 +20,19 @@
 #
 #
 
-
 import os
 import sys
-import shutil
-import subprocess
 import tempfile
 import unittest
 
 sys.path.insert(0, os.path.abspath(
-        os.path.join(os.path.dirname(os.path.realpath(__file__)), 'lib')))
+        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"))
 
-cdist_commands=["banner", "config", "install"]
-
-import cdist
-import cdist.config
-import cdist.exec
-
-class Exec(unittest.TestCase):
-    def setUp(self):
-        """Create shell code and co."""
-
-        self.temp_dir = tempfile.mkdtemp()
-        self.shell_false = os.path.join(self.temp_dir, "shell_false")
-        self.shell_true  = os.path.join(self.temp_dir, "shell_true")
-
-        true_fd = open(self.shell_true, "w")
-        true_fd.writelines(["#!/bin/sh\n", "/bin/true"])
-        true_fd.close()
-        
-        false_fd = open(self.shell_false, "w")
-        false_fd.writelines(["#!/bin/sh\n", "/bin/false"])
-        false_fd.close()
-
-    def tearDown(self):
-        shutil.rmtree(self.temp_dir)
-        
-    def test_local_success_shell(self):
-        try:
-            cdist.exec.shell_run_or_debug_fail(self.shell_true, [self.shell_true])
-        except cdist.Error:
-            failed = True
-        else:
-            failed = False
-
-        self.assertFalse(failed)
-
-    def test_local_fail_shell(self):
-        self.assertRaises(cdist.Error, cdist.exec.shell_run_or_debug_fail,
-            self.shell_false, [self.shell_false])
-
-    def test_local_success(self):
-        try:
-            cdist.exec.run_or_fail(["/bin/true"])
-        except cdist.Error:
-            failed = True
-        else:
-            failed = False
-
-        self.assertFalse(failed)
-
-    def test_local_fail(self):
-        self.assertRaises(cdist.Error, cdist.exec.run_or_fail, ["/bin/false"])
 
 class Config(unittest.TestCase):
     def setUp(self):
@@ -142,9 +90,7 @@ class Config(unittest.TestCase):
         manifest_fd.close()
 
         try:
-            print("a")
             self.config.run_initial_manifest()
-            print("b")
         except cdist.Error:
             failed = True
         else:
@@ -153,19 +99,3 @@ class Config(unittest.TestCase):
         self.assertFalse(failed)
 
 
-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)
-
-        
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_exec.py b/test/test_exec.py
new file mode 100755
index 00000000..901b5efd
--- /dev/null
+++ b/test/test_exec.py
@@ -0,0 +1,80 @@
+#!/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 shutil
+import subprocess
+import tempfile
+import unittest
+
+sys.path.insert(0, os.path.abspath(
+        os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
+
+import cdist.exec
+
+class Exec(unittest.TestCase):
+    def setUp(self):
+        """Create shell code and co."""
+
+        self.temp_dir = tempfile.mkdtemp()
+        self.shell_false = os.path.join(self.temp_dir, "shell_false")
+        self.shell_true  = os.path.join(self.temp_dir, "shell_true")
+
+        true_fd = open(self.shell_true, "w")
+        true_fd.writelines(["#!/bin/sh\n", "/bin/true"])
+        true_fd.close()
+        
+        false_fd = open(self.shell_false, "w")
+        false_fd.writelines(["#!/bin/sh\n", "/bin/false"])
+        false_fd.close()
+
+    def tearDown(self):
+        shutil.rmtree(self.temp_dir)
+        
+    def test_local_success_shell(self):
+        try:
+            cdist.exec.shell_run_or_debug_fail(self.shell_true, [self.shell_true])
+        except cdist.Error:
+            failed = True
+        else:
+            failed = False
+
+        self.assertFalse(failed)
+
+    def test_local_fail_shell(self):
+        self.assertRaises(cdist.Error, cdist.exec.shell_run_or_debug_fail,
+            self.shell_false, [self.shell_false])
+
+    def test_local_success(self):
+        try:
+            cdist.exec.run_or_fail(["/bin/true"])
+        except cdist.Error:
+            failed = True
+        else:
+            failed = False
+
+        self.assertFalse(failed)
+
+    def test_local_fail(self):
+        self.assertRaises(cdist.Error, cdist.exec.run_or_fail, ["/bin/false"])