diff --git a/tests.old/Setup and teardown/_dir files should be run once per directory, and the others should be run once per file. b/tests.old/Setup and teardown/_dir files should be run once per directory, and the others should be run once per file.
deleted file mode 100755
index 8dd2095..0000000
--- a/tests.old/Setup and teardown/_dir files should be run once per directory, and the others should be run once per file.	
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-[ $(../../urchin .test| grep 31|wc -l) -lt 3 ]
diff --git a/tests/Setup and Teardown/.test/.log b/tests/Setup and Teardown/.test/.log
new file mode 100644
index 0000000..dc40d1f
--- /dev/null
+++ b/tests/Setup and Teardown/.test/.log	
@@ -0,0 +1,3 @@
+setup has run
+setup has run
+setup has run
diff --git a/tests/Setup and Teardown/.test/.urchin b/tests/Setup and Teardown/.test/.urchin
new file mode 100644
index 0000000..e69de29
diff --git a/tests.old/Setup and teardown/.test/setup b/tests/Setup and Teardown/.test/setup
similarity index 100%
rename from tests.old/Setup and teardown/.test/setup
rename to tests/Setup and Teardown/.test/setup
diff --git a/tests.old/Setup and teardown/.test/setup has run twice a b/tests/Setup and Teardown/.test/setup has run twice a
similarity index 100%
rename from tests.old/Setup and teardown/.test/setup has run twice a
rename to tests/Setup and Teardown/.test/setup has run twice a
diff --git a/tests.old/Setup and teardown/.test/setup has run twice b b/tests/Setup and Teardown/.test/setup has run twice b
similarity index 100%
rename from tests.old/Setup and teardown/.test/setup has run twice b
rename to tests/Setup and Teardown/.test/setup has run twice b
diff --git a/tests.old/Setup and teardown/.test/setup_dir b/tests/Setup and Teardown/.test/setup_dir
similarity index 100%
rename from tests.old/Setup and teardown/.test/setup_dir
rename to tests/Setup and Teardown/.test/setup_dir
diff --git a/tests.old/Setup and teardown/.test/setup_dir runs b/tests/Setup and Teardown/.test/setup_dir runs
similarity index 100%
rename from tests.old/Setup and teardown/.test/setup_dir runs
rename to tests/Setup and Teardown/.test/setup_dir runs
diff --git a/tests.old/Setup and teardown/.test/setup_dir runs only oncea b/tests/Setup and Teardown/.test/setup_dir runs only oncea
similarity index 100%
rename from tests.old/Setup and teardown/.test/setup_dir runs only oncea
rename to tests/Setup and Teardown/.test/setup_dir runs only oncea
diff --git a/tests.old/Setup and teardown/.test/setup_dir runs only onceb b/tests/Setup and Teardown/.test/setup_dir runs only onceb
similarity index 100%
rename from tests.old/Setup and teardown/.test/setup_dir runs only onceb
rename to tests/Setup and Teardown/.test/setup_dir runs only onceb
diff --git a/tests.old/Setup and teardown/.test/teardown b/tests/Setup and Teardown/.test/teardown
similarity index 100%
rename from tests.old/Setup and teardown/.test/teardown
rename to tests/Setup and Teardown/.test/teardown
diff --git a/tests.old/Setup and teardown/.test/teardown has run twice a b/tests/Setup and Teardown/.test/teardown has run twice a
similarity index 100%
rename from tests.old/Setup and teardown/.test/teardown has run twice a
rename to tests/Setup and Teardown/.test/teardown has run twice a
diff --git a/tests.old/Setup and teardown/.test/teardown has run twice b b/tests/Setup and Teardown/.test/teardown has run twice b
similarity index 100%
rename from tests.old/Setup and teardown/.test/teardown has run twice b
rename to tests/Setup and Teardown/.test/teardown has run twice b
diff --git a/tests.old/Setup and teardown/.test/teardown_dir b/tests/Setup and Teardown/.test/teardown_dir
similarity index 100%
rename from tests.old/Setup and teardown/.test/teardown_dir
rename to tests/Setup and Teardown/.test/teardown_dir
diff --git a/tests/Setup and Teardown/_dir files should be run once per directory, and the others should be run once per file. b/tests/Setup and Teardown/_dir files should be run once per directory, and the others should be run once per file.
new file mode 100755
index 0000000..da79d79
--- /dev/null
+++ b/tests/Setup and Teardown/_dir files should be run once per directory, and the others should be run once per file.	
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+$TEST_SHELL ../../urchin --run-in-series .test
diff --git a/urchin b/urchin
index 80e1e70..17be33c 100755
--- a/urchin
+++ b/urchin
@@ -442,7 +442,7 @@ you don't need to quote the TEST_SHELL variable." > /dev/stderr
           echo "$shell_for_sh_tests" >> "$shell_list"
           ;;
         -n) cycle_shell=false;; 
-        -t) tap_format=true;;
+        -t|--tap) tap_format=true;;
         -h|--help) urchin_help
           exit 0;;
         --version) echo "$VERSION"