diff --git a/unittests/3.x/assign_const.chai b/unittests/3.x/assign_const.chai
deleted file mode 100644
index 9726ed50..00000000
--- a/unittests/3.x/assign_const.chai
+++ /dev/null
@@ -1,2 +0,0 @@
-assert_throws("Error: \"Error, cannot assign to constant value.\"", fun() { 1 = 2 } );
-assert_throws("Error: \"Error, cannot assign to constant value.\"", fun() { 1 + 2 = 2 } );
diff --git a/unittests/3.x/bind.chai b/unittests/3.x/bind.chai
deleted file mode 100644
index 3c72673f..00000000
--- a/unittests/3.x/bind.chai
+++ /dev/null
@@ -1,2 +0,0 @@
-var prod = bind(foldl, _, `*`, 1.0)
-assert_equal(60, prod([3, 4, 5]))
diff --git a/unittests/3.x/bind2.chai b/unittests/3.x/bind2.chai
deleted file mode 100644
index 0b8ddde3..00000000
--- a/unittests/3.x/bind2.chai
+++ /dev/null
@@ -1,34 +0,0 @@
-
-def add(x, y)
-{
-  return x + y;
-}
-
-assert_equal(2, add.get_arity());
-
-var b = bind(add, 2, _);
-
-assert_equal(1, b.get_arity());
-
-var c = bind(b, 3);
-
-assert_equal(0, c.get_arity());
-
-assert_equal(6, b(4));
-assert_equal(5, c());
-
-def concat2(a,b,c,d)
-{
-  return to_string(a) + to_string(b) + to_string(c) + to_string(d);
-}
-
-var d = bind(concat2, _, " Hello ", _, " World");
-assert_equal(2, d.get_arity());
-
-assert_equal("1 Hello 3 World", d(1,3));
-
-var e = bind(`<`, _, 5);
-var types = e.get_param_types();
-assert_equal(2, types.size());
-assert_equal(true, types[0].bare_equal(bool_type));
-
diff --git a/unittests/3.x/block_start.chai b/unittests/3.x/block_start.chai
deleted file mode 100644
index 4830af1f..00000000
--- a/unittests/3.x/block_start.chai
+++ /dev/null
@@ -1 +0,0 @@
-{print("hello")}
diff --git a/unittests/3.x/bool_not.chai b/unittests/3.x/bool_not.chai
deleted file mode 100644
index fe4d0f77..00000000
--- a/unittests/3.x/bool_not.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(false, !true)
diff --git a/unittests/3.x/break_while.chai b/unittests/3.x/break_while.chai
deleted file mode 100644
index 5ff897c8..00000000
--- a/unittests/3.x/break_while.chai
+++ /dev/null
@@ -1,7 +0,0 @@
-var i = 0
-while (i < 10) {
-  if (++i == 5) {
-    break
-  }
-}
-assert_equal(5, i);
diff --git a/unittests/3.x/char_init.chai b/unittests/3.x/char_init.chai
deleted file mode 100644
index ce764774..00000000
--- a/unittests/3.x/char_init.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal("b", to_string('b'))
diff --git a/unittests/3.x/classification.chai b/unittests/3.x/classification.chai
deleted file mode 100644
index 8c2cca94..00000000
--- a/unittests/3.x/classification.chai
+++ /dev/null
@@ -1,7 +0,0 @@
-assert_equal(true, 1.is_var_const());
-assert_equal(false, 1.is_var_reference());
-assert_equal(true, 1.is_var_pointer());
-assert_equal(false, 1.is_var_null());
-assert_equal(false, 1.is_var_undef());
-var i;
-assert_equal(true, i.is_var_undef());
diff --git a/unittests/3.x/collate.chai b/unittests/3.x/collate.chai
deleted file mode 100644
index 12632e59..00000000
--- a/unittests/3.x/collate.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var v = collate(1, 2)
-assert_equal(1, v[0])
-assert_equal(2, v[1])
diff --git a/unittests/3.x/compare_gt.chai b/unittests/3.x/compare_gt.chai
deleted file mode 100644
index 9a6ea456..00000000
--- a/unittests/3.x/compare_gt.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(false, 1 > 2);
diff --git a/unittests/3.x/compare_lt.chai b/unittests/3.x/compare_lt.chai
deleted file mode 100644
index 60641103..00000000
--- a/unittests/3.x/compare_lt.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(true, 1 < 2)
diff --git a/unittests/3.x/concat.chai b/unittests/3.x/concat.chai
deleted file mode 100644
index 3d285a5b..00000000
--- a/unittests/3.x/concat.chai
+++ /dev/null
@@ -1,5 +0,0 @@
-var v = concat([1, 2], [3, 4]);
-
-assert_equal(4, v.size());
-assert_equal(1, v[0]);
-assert_equal(4, v[3]);
diff --git a/unittests/3.x/const_range_test.chai b/unittests/3.x/const_range_test.chai
deleted file mode 100644
index 5ebb5808..00000000
--- a/unittests/3.x/const_range_test.chai
+++ /dev/null
@@ -1,4 +0,0 @@
-//If the following succeeds, the test passes
-
-
-"Hello World".for_each(fun(x) { print(x) } )
diff --git a/unittests/3.x/convert_double_string.chai b/unittests/3.x/convert_double_string.chai
deleted file mode 100644
index e12b90f2..00000000
--- a/unittests/3.x/convert_double_string.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal("3.5bob", 3.5.to_string() + "bob");
diff --git a/unittests/3.x/convert_int_string.chai b/unittests/3.x/convert_int_string.chai
deleted file mode 100644
index 0fcda326..00000000
--- a/unittests/3.x/convert_int_string.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal("3bob", 3.to_string + "bob")
diff --git a/unittests/3.x/convert_string_double.chai b/unittests/3.x/convert_string_double.chai
deleted file mode 100644
index b7b0b6ef..00000000
--- a/unittests/3.x/convert_string_double.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(6.8, "3.5".to_double() + 3.3)
diff --git a/unittests/3.x/convert_string_int.chai b/unittests/3.x/convert_string_int.chai
deleted file mode 100644
index e62eec95..00000000
--- a/unittests/3.x/convert_string_int.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(8, "4".to_int() + 4)
diff --git a/unittests/3.x/deep_array_lookup.chai b/unittests/3.x/deep_array_lookup.chai
deleted file mode 100644
index c405302d..00000000
--- a/unittests/3.x/deep_array_lookup.chai
+++ /dev/null
@@ -1,11 +0,0 @@
-var a = [1,2,3, [4,5,6] ]
-
-assert_equal(a[3][0], 4)
-
-
-def Test::Test() { this.a = [1,2,3]; }
-attr Test::a;
-
-var t = Test();
-
-assert_equal(t.a[0], 1)
diff --git a/unittests/3.x/dispatch_functions.chai b/unittests/3.x/dispatch_functions.chai
deleted file mode 100644
index f25ae017..00000000
--- a/unittests/3.x/dispatch_functions.chai
+++ /dev/null
@@ -1,10 +0,0 @@
-assert_equal(`==`, `==`);
-assert_not_equal(`==`, `<`);
-assert_equal(`<`.get_arity(), 2);
-assert_equal(get_arity.get_contained_functions().size(), 0);
-assert_equal(get_arity.get_arity(), 1);
-assert_equal(get_arity.get_param_types().size(), 2);
-
-var paramtypes = get_arity.get_param_types();
-
-assert_equal(true, paramtypes[1].bare_equal(Function_type));
diff --git a/unittests/3.x/drop.chai b/unittests/3.x/drop.chai
deleted file mode 100644
index c64b431e..00000000
--- a/unittests/3.x/drop.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal([3,4], drop([1, 2, 3, 4], 2))
diff --git a/unittests/3.x/drop_while.chai b/unittests/3.x/drop_while.chai
deleted file mode 100644
index 08e19f2f..00000000
--- a/unittests/3.x/drop_while.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal([2, 3], drop_while([1, 2, 3], odd))
diff --git a/unittests/3.x/empty.chai b/unittests/3.x/empty.chai
deleted file mode 100644
index e69de29b..00000000
diff --git a/unittests/3.x/equ_shortform.chai b/unittests/3.x/equ_shortform.chai
deleted file mode 100644
index 41c8e1de..00000000
--- a/unittests/3.x/equ_shortform.chai
+++ /dev/null
@@ -1,4 +0,0 @@
-var x=.5
-assert_equal(.5, x)
-var y=-.5
-assert_equal(-.5, y)
diff --git a/unittests/3.x/eval.chai b/unittests/3.x/eval.chai
deleted file mode 100644
index 2f18aa41..00000000
--- a/unittests/3.x/eval.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(7, eval("3 + 4"))
diff --git a/unittests/3.x/eval_error.chai b/unittests/3.x/eval_error.chai
deleted file mode 100644
index b5814450..00000000
--- a/unittests/3.x/eval_error.chai
+++ /dev/null
@@ -1,38 +0,0 @@
-
-def deep()
-{
-  try {
-  } catch {
-
-  } finally {
-    if (2)
-    {
-    }
-
-  }
-}
-
-def func()
-{
-  deep();
-}
-
-def doing()
-{
-  for (var i = 0; i < 10; ++i)
-  {
-    func();
-  }
-}
-
-def while_doing()
-{
-  while (true)
-  {
-    doing();
-  }
-}
-
-var f = fun() { while_doing(); }
-
-assert_true(get_eval_error(f).call_stack.size() <= 16)
diff --git a/unittests/3.x/even.chai b/unittests/3.x/even.chai
deleted file mode 100644
index 5a9a9aea..00000000
--- a/unittests/3.x/even.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(true, even(4))
diff --git a/unittests/3.x/exception.chai b/unittests/3.x/exception.chai
deleted file mode 100644
index 50df6a80..00000000
--- a/unittests/3.x/exception.chai
+++ /dev/null
@@ -1,9 +0,0 @@
-var x = 1
-try {
-  throw(x)
-  x = 2
-}
-catch(e) {
-  x = e + 3
-}
-assert_equal(4, x);
diff --git a/unittests/3.x/exception_finally.chai b/unittests/3.x/exception_finally.chai
deleted file mode 100644
index d6fd834a..00000000
--- a/unittests/3.x/exception_finally.chai
+++ /dev/null
@@ -1,32 +0,0 @@
-var finallyone = false;
-
-try {
-  throw(3)
-}
-catch(x) { 
-  assert_equal(3, x)
-}
-finally {
-  finallyone = true;
-}
-
-assert_equal(true, finallyone);
-
-var try2 = false;
-var catch2 = false;
-var finally2 = false;
-
-
-try {
-  try2 = true;
-}
-catch {
-  catch2 = true;
-}
-finally {
-  finally2 = true;
-}
-
-assert_equal(true, try2);
-assert_equal(false, catch2);
-assert_equal(true, finally2);
diff --git a/unittests/3.x/filter.chai b/unittests/3.x/filter.chai
deleted file mode 100644
index 6d805fee..00000000
--- a/unittests/3.x/filter.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal([1,3], filter([1, 2, 3, 4], odd))
diff --git a/unittests/3.x/float.chai b/unittests/3.x/float.chai
deleted file mode 100644
index b1bdf299..00000000
--- a/unittests/3.x/float.chai
+++ /dev/null
@@ -1,7 +0,0 @@
-assert_equal(true, 1.2 < 2)
-assert_equal(true, 1.2 > 1)
-assert_equal(1.2, 1.2)
-
-assert_equal(true, .5 > 0)
-assert_equal(true, .5 < 1)
-assert_equal(0.5, .5)
diff --git a/unittests/3.x/foldl.chai b/unittests/3.x/foldl.chai
deleted file mode 100644
index 7e9db51f..00000000
--- a/unittests/3.x/foldl.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(10, foldl([1, 2, 3, 4], `+`, 0))
diff --git a/unittests/3.x/for.chai b/unittests/3.x/for.chai
deleted file mode 100644
index 9799be24..00000000
--- a/unittests/3.x/for.chai
+++ /dev/null
@@ -1,7 +0,0 @@
-var ret = []
-
-for (var i = 0; i < 5; ++i) {
-  ret.push_back(i);
-}
-
-assert_equal([0,1,2,3,4], ret);
diff --git a/unittests/3.x/for_each.chai b/unittests/3.x/for_each.chai
deleted file mode 100644
index 242a1baf..00000000
--- a/unittests/3.x/for_each.chai
+++ /dev/null
@@ -1 +0,0 @@
-for_each([1, 2, 3], print)
diff --git a/unittests/3.x/for_each_range.chai b/unittests/3.x/for_each_range.chai
deleted file mode 100644
index 43191bfb..00000000
--- a/unittests/3.x/for_each_range.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var v = [1,2,3];
-var r = range(v);
-for_each(r, fun(x) { assert_equal(true, x>0); } )
diff --git a/unittests/3.x/for_each_retro.chai b/unittests/3.x/for_each_retro.chai
deleted file mode 100644
index cc27a580..00000000
--- a/unittests/3.x/for_each_retro.chai
+++ /dev/null
@@ -1,4 +0,0 @@
-// Don't bother checking the output from this one, just makes sure it executes
-var v = [1,2,3];
-var r = retro(range(v));
-for_each(r, print)
diff --git a/unittests/3.x/function_array_adjacent.chai b/unittests/3.x/function_array_adjacent.chai
deleted file mode 100644
index c34e2be9..00000000
--- a/unittests/3.x/function_array_adjacent.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(2, `+`.get_contained_functions()[0].get_arity())
diff --git a/unittests/3.x/function_introspection.chai b/unittests/3.x/function_introspection.chai
deleted file mode 100644
index 014cf45d..00000000
--- a/unittests/3.x/function_introspection.chai
+++ /dev/null
@@ -1,75 +0,0 @@
-
-#Test Function Description
-def test_function(a)
-{
-  return a;
-}
-
-
-
-
-// test_function tests
-assert_equal(test_function.get_arity(), 1);
-assert_equal(test_function.get_contained_functions().size(), 0);
-assert_equal(test_function.get_param_types().size(), 2);
-
-assert_equal(test_function, test_function);
-
-assert_not_equal(test_function, `+`);
-
-assert_equal(test_function.call([1]), 1);
-
-// dynamic object function tests
-
-def int::test_fun()
-{
-  return this;
-}
-
-assert_equal(test_fun.get_arity(), 1);
-assert_equal(test_fun.get_contained_functions.size(), 1);
-assert_equal(test_fun.get_param_types().size(), 2);
-assert_equal(test_fun, test_fun);
-var test_fun_types = test_fun.get_param_types();
-assert_equal(true, test_fun_types[0].bare_equal(Object_type));
-assert_equal(true, test_fun_types[1].bare_equal(int_type));
-
-
-// built-ins tests
-
-assert_equal(2, `==`.get_arity());
-
-// < should be the merging of two functions bool <(PODObject, PODObject) and bool <(string, string)
-// we want to peel it apart and make sure that's true
-var types = `<`.get_param_types();
-assert_equal(3, types.size());
-assert_equal(true, types[0].bare_equal(bool_type));
-assert_equal(true, types[1].bare_equal(Object_type));
-assert_equal(true, types[2].bare_equal(Object_type));
-assert_equal(2, `<`.get_contained_functions().size());
-
-
-// guard existence tests
-
-def with_guard(x) : x > 3 {}
-def without_guard(x) {}
-
-def group_guard(x) {}
-def group_guard(x) : x > 3 {}
-
-assert_equal(true, with_guard.has_guard());
-assert_equal(false, without_guard.has_guard());
-
-assert_equal(2, group_guard.get_contained_functions().size());
-var group = group_guard.get_contained_functions();
-
-assert_equal(true, group[0].has_guard())
-assert_equal(false, group[1].has_guard())
-
-assert_throws("Function does not have a guard", fun[group]() { group[1].get_guard(); } );
-assert_throws("Function does not have a guard", fun[without_guard]() { without_guard.get_guard(); } );
-
-var guard = with_guard.get_guard();
-
-assert_equal(false, guard.has_guard());
-assert_throws("Function does not have a guard", fun[guard]() { guard.get_guard(); } );
diff --git a/unittests/3.x/function_reassignment.chai b/unittests/3.x/function_reassignment.chai
deleted file mode 100644
index 2a885fdc..00000000
--- a/unittests/3.x/function_reassignment.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var x = `+`
-x = `-`
-assert_equal(1, x(5,4))
diff --git a/unittests/3.x/generate_range.chai b/unittests/3.x/generate_range.chai
deleted file mode 100644
index 9e25970a..00000000
--- a/unittests/3.x/generate_range.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal([1,2,3,4,5,6,7,8,9,10], generate_range(1, 10))
diff --git a/unittests/3.x/global_const_in_module.chai b/unittests/3.x/global_const_in_module.chai
deleted file mode 100644
index c9ca65a6..00000000
--- a/unittests/3.x/global_const_in_module.chai
+++ /dev/null
@@ -1,7 +0,0 @@
-load_module("test_module")
-
-
-assert_equal(to_int(TestValue1), 1)
-
-assert_equal(TestValue1.type_name(), "TestEnum")
-
diff --git a/unittests/3.x/if.chai b/unittests/3.x/if.chai
deleted file mode 100644
index 3ec7321b..00000000
--- a/unittests/3.x/if.chai
+++ /dev/null
@@ -1,7 +0,0 @@
-var t = false;
-
-if (true) {
-  t = true;
-}
-
-assert_equal(true, t);
diff --git a/unittests/3.x/if_else.chai b/unittests/3.x/if_else.chai
deleted file mode 100644
index 8cb42db9..00000000
--- a/unittests/3.x/if_else.chai
+++ /dev/null
@@ -1,13 +0,0 @@
-var i = 3
-var b1 = false;
-var b2 = false;
-
-if (i == 2) {
-  b1 = true;
-}
-else {
-  b2 = true;
-}
-
-assert_equal(false, b1);
-assert_equal(true, b2);
diff --git a/unittests/3.x/if_elseif.chai b/unittests/3.x/if_elseif.chai
deleted file mode 100644
index 75b85b5f..00000000
--- a/unittests/3.x/if_elseif.chai
+++ /dev/null
@@ -1,18 +0,0 @@
-var b1 = false;
-var b2 = false;
-var b3 = false;
-
-var i = 3
-if (i == 2) {
-  b1 = true;
-}
-else if (i == 4) {
-  b2 = true;
-}
-else if (i == 3) {
-  b3 = true;
-}
-
-assert_equal(false, b1);
-assert_equal(false, b2);
-assert_equal(true, b3);
diff --git a/unittests/3.x/if_elseif_else.chai b/unittests/3.x/if_elseif_else.chai
deleted file mode 100644
index 26ed0d26..00000000
--- a/unittests/3.x/if_elseif_else.chai
+++ /dev/null
@@ -1,14 +0,0 @@
-var i = 3
-var b = false
-if (i == 2) {
-  assert_equal(false, true)
-}
-else if (i == 4) {
-  assert_equal(false, true)
-}
-else {
-  assert_equal(true, true)
-  b = true
-}
-
-assert_equal(true, b)
diff --git a/unittests/3.x/index_operator.chai b/unittests/3.x/index_operator.chai
deleted file mode 100644
index e8af5cf6..00000000
--- a/unittests/3.x/index_operator.chai
+++ /dev/null
@@ -1,10 +0,0 @@
-
-// tests more complex parses of the index operator
-
-def Bob::bob3() { return [1,2,3]; }
-def Bob::Bob() {}
-var b = Bob();
-
-
-assert_equal(b.bob3()[0], 1);
-assert_equal((b.bob3())[1], 2);
diff --git a/unittests/3.x/inheritance.chai b/unittests/3.x/inheritance.chai
deleted file mode 100644
index 1fcd346b..00000000
--- a/unittests/3.x/inheritance.chai
+++ /dev/null
@@ -1,8 +0,0 @@
-load_module("test_module")
-
-var t0 = TestBaseType()
-var t = TestDerivedType();
-
-assert_equal(t0.func(), 0);
-assert_equal(t.func(), 1);
-
diff --git a/unittests/3.x/instring_eval.chai b/unittests/3.x/instring_eval.chai
deleted file mode 100644
index a72b2fc4..00000000
--- a/unittests/3.x/instring_eval.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var bob = 5.5
-assert_equal("5.5", "${bob}")
-assert_equal("val: 8 and 8", "val: ${5.5 + 2.5} and ${bob + 2.5}")
diff --git a/unittests/3.x/instring_eval_more.chai b/unittests/3.x/instring_eval_more.chai
deleted file mode 100644
index 17768f82..00000000
--- a/unittests/3.x/instring_eval_more.chai
+++ /dev/null
@@ -1,4 +0,0 @@
-assert_equal("\$ {4 + 5}", "$ {4 + 5}")
-assert_equal("\$9", "$${4+5}")
-assert_equal("Value: \${4 + 5}", "Value: \${4 + 5}")
-assert_equal("Value: \$9", "Value: \$${4 + 5}")
diff --git a/unittests/3.x/invalid_function_assignment.chai b/unittests/3.x/invalid_function_assignment.chai
deleted file mode 100644
index 3aa1bc2f..00000000
--- a/unittests/3.x/invalid_function_assignment.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_throws("Error: \"Error, cannot assign to constant value.\"", fun() { clone = `-` } );
diff --git a/unittests/3.x/invalid_function_reassignment.chai b/unittests/3.x/invalid_function_reassignment.chai
deleted file mode 100644
index 77307b6f..00000000
--- a/unittests/3.x/invalid_function_reassignment.chai
+++ /dev/null
@@ -1,2 +0,0 @@
-assert_throws("Error: \"Unable to find appropriate'=' operator.\" With parameters: (int, const Function)", fun() { auto x = 5; x = `-`; } );
-
diff --git a/unittests/3.x/is_undef.chai b/unittests/3.x/is_undef.chai
deleted file mode 100644
index 38572f0f..00000000
--- a/unittests/3.x/is_undef.chai
+++ /dev/null
@@ -1,4 +0,0 @@
-var i;
-assert_equal(true, i.is_var_undef());
-i = 5;
-assert_equal(false, i.is_var_undef());
diff --git a/unittests/3.x/join.chai b/unittests/3.x/join.chai
deleted file mode 100644
index 1891c468..00000000
--- a/unittests/3.x/join.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal("1*2*3", join([1, 2, 3], "*"))
diff --git a/unittests/3.x/lambda.chai b/unittests/3.x/lambda.chai
deleted file mode 100644
index 6b65a1ba..00000000
--- a/unittests/3.x/lambda.chai
+++ /dev/null
@@ -1,2 +0,0 @@
-var bob = fun(x) { x + 1 }
-assert_equal(4, bob(3));
diff --git a/unittests/3.x/list_push_back.chai b/unittests/3.x/list_push_back.chai
deleted file mode 100644
index 4d88deb8..00000000
--- a/unittests/3.x/list_push_back.chai
+++ /dev/null
@@ -1,8 +0,0 @@
-load_module("stl_extra")
-
-var x = List()
-x.push_back(3)
-x.push_back("A")
-
-assert_equal(3, x.front());
-assert_equal("A", x.back());
diff --git a/unittests/3.x/list_push_front.chai b/unittests/3.x/list_push_front.chai
deleted file mode 100644
index 86e28329..00000000
--- a/unittests/3.x/list_push_front.chai
+++ /dev/null
@@ -1,8 +0,0 @@
-load_module("stl_extra")
-
-var x = List()
-x.push_front(3)
-x.push_front("A")
-
-assert_equal("A", x.front());
-assert_equal(3, x.back());
diff --git a/unittests/3.x/load_module.chai b/unittests/3.x/load_module.chai
deleted file mode 100644
index a231a200..00000000
--- a/unittests/3.x/load_module.chai
+++ /dev/null
@@ -1,2 +0,0 @@
-load_module("test_module")
-assert_equal("Hello World", hello_world());
diff --git a/unittests/3.x/loop_inner_outer.chai b/unittests/3.x/loop_inner_outer.chai
deleted file mode 100644
index 64a25e6e..00000000
--- a/unittests/3.x/loop_inner_outer.chai
+++ /dev/null
@@ -1,9 +0,0 @@
-var total = 0
-
-for (var i = 0; i < 10; ++i) {
-  for (var j = 0; j < 10; ++j) {
-    total += 1
-  }
-}
-
-assert_equal(100, total);
diff --git a/unittests/3.x/malformed_inline_map.chai b/unittests/3.x/malformed_inline_map.chai
deleted file mode 100644
index 1488ded4..00000000
--- a/unittests/3.x/malformed_inline_map.chai
+++ /dev/null
@@ -1,8 +0,0 @@
-
-try {
-   eval("[\"hello\":5,\"j\",\"k\"]");
-   assert_true(false);
-} catch (eval_error ee) {
-}
-
-
diff --git a/unittests/3.x/map.chai b/unittests/3.x/map.chai
deleted file mode 100644
index a0a31ee1..00000000
--- a/unittests/3.x/map.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal([true, false, true], map([1,2,3], odd))
diff --git a/unittests/3.x/map_access.chai b/unittests/3.x/map_access.chai
deleted file mode 100644
index 19ebc1ad..00000000
--- a/unittests/3.x/map_access.chai
+++ /dev/null
@@ -1,2 +0,0 @@
-var x = ["bob":2, "fred":3]
-assert_equal(3, x["fred"])
diff --git a/unittests/3.x/map_inplace_init.chai b/unittests/3.x/map_inplace_init.chai
deleted file mode 100644
index b1d8221b..00000000
--- a/unittests/3.x/map_inplace_init.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var x = ["bob":1, "fred":2]
-
-assert_equal(2, x.size());
diff --git a/unittests/3.x/math_add.chai b/unittests/3.x/math_add.chai
deleted file mode 100644
index bcb90369..00000000
--- a/unittests/3.x/math_add.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(3, (1 + 2))
diff --git a/unittests/3.x/math_add_mixed.chai b/unittests/3.x/math_add_mixed.chai
deleted file mode 100644
index b000cafe..00000000
--- a/unittests/3.x/math_add_mixed.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(3.5, 1.5 + 2)
diff --git a/unittests/3.x/math_dec.chai b/unittests/3.x/math_dec.chai
deleted file mode 100644
index e746f298..00000000
--- a/unittests/3.x/math_dec.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var i = 3
-assert_equal(2, --i)
-assert_equal(2, i)
diff --git a/unittests/3.x/math_div.chai b/unittests/3.x/math_div.chai
deleted file mode 100644
index 971f2170..00000000
--- a/unittests/3.x/math_div.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(2, 10/5)
diff --git a/unittests/3.x/math_inc.chai b/unittests/3.x/math_inc.chai
deleted file mode 100644
index ec317c03..00000000
--- a/unittests/3.x/math_inc.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var i = 3
-assert_equal(4, ++i)
-assert_equal(4, i)
diff --git a/unittests/3.x/math_mod.chai b/unittests/3.x/math_mod.chai
deleted file mode 100644
index 326c35a9..00000000
--- a/unittests/3.x/math_mod.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(2, 11 % 3)
diff --git a/unittests/3.x/math_mult.chai b/unittests/3.x/math_mult.chai
deleted file mode 100644
index 94c355d6..00000000
--- a/unittests/3.x/math_mult.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(12, 3 * 4)
diff --git a/unittests/3.x/math_negate.chai b/unittests/3.x/math_negate.chai
deleted file mode 100644
index 36bae880..00000000
--- a/unittests/3.x/math_negate.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(-7, -(3 + 4))
diff --git a/unittests/3.x/math_paren.chai b/unittests/3.x/math_paren.chai
deleted file mode 100644
index 01b7f205..00000000
--- a/unittests/3.x/math_paren.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(27, 3*(4+5))
diff --git a/unittests/3.x/math_sub.chai b/unittests/3.x/math_sub.chai
deleted file mode 100644
index 7e8342c1..00000000
--- a/unittests/3.x/math_sub.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(2, 5 - 3)
diff --git a/unittests/3.x/max.chai b/unittests/3.x/max.chai
deleted file mode 100644
index 533e7e84..00000000
--- a/unittests/3.x/max.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(5, max(3, 5))
diff --git a/unittests/3.x/memberscope.chai b/unittests/3.x/memberscope.chai
deleted file mode 100644
index fe46810a..00000000
--- a/unittests/3.x/memberscope.chai
+++ /dev/null
@@ -1,12 +0,0 @@
-attr Vector3::x
-attr Vector3::y
-attr Vector3::z
-
-def Vector3::Vector3(x, y, z) {
-    this.x = x
-    this.y = y
-    this.z = z
-}
-
-var v = Vector3(1,2,3);
-assert_equal(1, v.x);
diff --git a/unittests/3.x/method_sugar.chai b/unittests/3.x/method_sugar.chai
deleted file mode 100644
index 521400bc..00000000
--- a/unittests/3.x/method_sugar.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(6, [1, 2, 3].sum())
diff --git a/unittests/3.x/min.chai b/unittests/3.x/min.chai
deleted file mode 100644
index 0ef1ba79..00000000
--- a/unittests/3.x/min.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(3, min(3, 5))
diff --git a/unittests/3.x/mmd1.chai b/unittests/3.x/mmd1.chai
deleted file mode 100644
index 36121a90..00000000
--- a/unittests/3.x/mmd1.chai
+++ /dev/null
@@ -1,20 +0,0 @@
-def bob(x, y, z) {
-  x + y + z
-}
-
-def bob(x, y) {
-  x - y
-}
-
-def bob(x) {
-  -x
-}
-
-def bob() {
-  10
-}
-
-assert_equal(10, bob())
-assert_equal(-5, bob(5))
-assert_equal(-1, bob(5,6))
-assert_equal(18, bob(5,6,7))
diff --git a/unittests/3.x/mmd2.chai b/unittests/3.x/mmd2.chai
deleted file mode 100644
index 1c5f1771..00000000
--- a/unittests/3.x/mmd2.chai
+++ /dev/null
@@ -1,9 +0,0 @@
-def bob(x, y) : x > 10 { x - y }
-
-def bob(x, y) : x > 5 { x - y + 10 }
-
-def bob(x, y) { x + y }
-
-assert_equal(7, bob(3,4))
-assert_equal(9, bob(6,7))
-assert_equal(-1, bob(11,12))
diff --git a/unittests/3.x/multiline.chai b/unittests/3.x/multiline.chai
deleted file mode 100644
index f13be4e6..00000000
--- a/unittests/3.x/multiline.chai
+++ /dev/null
@@ -1,9 +0,0 @@
-var x = [1, 2,
- 3, 4]
-
-assert_equal(1, x[0])
-
-var y = map(x, 
- fun(x) { x + 1 })
-
-assert_equal(2, y[0])
diff --git a/unittests/3.x/number_formats.chai b/unittests/3.x/number_formats.chai
deleted file mode 100644
index c80ece04..00000000
--- a/unittests/3.x/number_formats.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-assert_equal(10, 012)
-assert_equal(31, 0x1f)
-assert_equal(3, 0b11)
diff --git a/unittests/3.x/object_attr.chai b/unittests/3.x/object_attr.chai
deleted file mode 100644
index c2da08ea..00000000
--- a/unittests/3.x/object_attr.chai
+++ /dev/null
@@ -1,6 +0,0 @@
-attr bob::z
-def bob::bob() { this.z = 10 }
-var x = bob()
-def bob::fred(x) { this.z - x }
-
-assert_equal(7, x.fred(3))
diff --git a/unittests/3.x/object_attr_same_name.chai b/unittests/3.x/object_attr_same_name.chai
deleted file mode 100644
index fa20bac4..00000000
--- a/unittests/3.x/object_attr_same_name.chai
+++ /dev/null
@@ -1,9 +0,0 @@
-attr bob::z
-def bob::bob() { this.z = 10 }
-
-attr bob2::z
-def bob2::bob2() { this.z = 12 }
-
-var b = bob();
-var b2 = bob2();
-
diff --git a/unittests/3.x/object_clone.chai b/unittests/3.x/object_clone.chai
deleted file mode 100644
index 4659f41a..00000000
--- a/unittests/3.x/object_clone.chai
+++ /dev/null
@@ -1,11 +0,0 @@
-attr bob::z
-def bob::bob() { }
-
-var x = bob();
-x.z = 10;
-
-var y = clone(x);
-y.z = 20;
-
-assert_equal(10, x.z)
-assert_equal(20, y.z)
diff --git a/unittests/3.x/object_constructor_guards.chai b/unittests/3.x/object_constructor_guards.chai
deleted file mode 100644
index f48c00a1..00000000
--- a/unittests/3.x/object_constructor_guards.chai
+++ /dev/null
@@ -1,10 +0,0 @@
-attr bob::val
-
-def bob::bob(x) : x < 10 { this.val = "Less Than Ten: " + x.to_string(); }
-def bob::bob(x) { this.val = "Any Other Value: " + x.to_string(); }
-
-var b = bob(12)
-var c = bob(3)
-
-assert_equal("Any Other Value: 12", b.val )
-assert_equal("Less Than Ten: 3", c.val )
diff --git a/unittests/3.x/object_method_guards.chai b/unittests/3.x/object_method_guards.chai
deleted file mode 100644
index addc8508..00000000
--- a/unittests/3.x/object_method_guards.chai
+++ /dev/null
@@ -1,7 +0,0 @@
-def bob::bob() { }
-def bob::fred(e) : e < 10 { assert_equal(true, e<10) }
-def bob::fred(e) { assert_equal(true, e >= 10) }
-
-var b = bob()
-b.fred(3)
-b.fred(12)
diff --git a/unittests/3.x/odd.chai b/unittests/3.x/odd.chai
deleted file mode 100644
index dbaf2a01..00000000
--- a/unittests/3.x/odd.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(false, odd(4))
diff --git a/unittests/3.x/operator_overload.chai b/unittests/3.x/operator_overload.chai
deleted file mode 100644
index 9bd2eb79..00000000
--- a/unittests/3.x/operator_overload.chai
+++ /dev/null
@@ -1,9 +0,0 @@
-def Bob::`+`(y) { this.x + y.x }
-def Bob::Bob() { }
-attr Bob::x
-var b = Bob()
-var c = Bob()
-b.x = 4
-c.x = 5
-
-assert_equal(9, b+c)
diff --git a/unittests/3.x/operator_overload2.chai b/unittests/3.x/operator_overload2.chai
deleted file mode 100644
index b4afbe7b..00000000
--- a/unittests/3.x/operator_overload2.chai
+++ /dev/null
@@ -1,9 +0,0 @@
-def Bob::Bob() { }
-attr Bob::x
-def `-`(a, b) : is_type(a, "Bob") && is_type(b, "Bob") { a.x - b.x }
-var b = Bob()
-var c = Bob()
-b.x = 4
-c.x = 5
-
-assert_equal(-1, b-c)
diff --git a/unittests/3.x/operators_float.chai b/unittests/3.x/operators_float.chai
deleted file mode 100644
index 847f5e58..00000000
--- a/unittests/3.x/operators_float.chai
+++ /dev/null
@@ -1,16 +0,0 @@
-var i = 1.0;
-var j = 2.0;
-var k = 3.0;
-
-assert_equal(3, i + j)
-assert_equal(1.0, +i)
-assert_equal(-1, i-j)
-assert_equal(-1, -i)
-assert_equal(1.5, k/j)
-assert_equal(6, j*k)
-
-assert_equal(0, i -= i)
-assert_equal(3, j *= 1.5)
-assert_equal(1.5, j /= 2)
-assert_equal(2.5, j += 1)
-assert_throws("Error: \"Error with numeric operator calling: %\"", fun[k]() { k % 2 } );
diff --git a/unittests/3.x/operators_int.chai b/unittests/3.x/operators_int.chai
deleted file mode 100644
index 4627b552..00000000
--- a/unittests/3.x/operators_int.chai
+++ /dev/null
@@ -1,31 +0,0 @@
-var i = 1;
-var j = 2;
-var k = 3;
-
-assert_equal(3, i + j);
-assert_equal(1, +i);
-assert_equal(-1, i - j);
-assert_equal(-1, -i);
-assert_equal(2, j & k);
-assert_equal(-3, ~j);
-assert_equal(1, j ^ k);
-assert_equal(3, i | j);
-assert_equal(2, j / i);
-assert_equal(4, i << j);
-assert_equal(6, j * k);
-assert_equal(1, k % j);
-assert_equal(1, j >> i);
-
-assert_equal(0, i &= 2);
-assert_equal(1, j ^= 3);
-assert_equal(3, j |= 2);
-assert_equal(-1, i -= 1);
-assert_equal(6, j <<= 1);
-assert_equal(12, j *= 2);
-assert_equal(6, j /= 2);
-assert_equal(2, j %= 4);
-assert_equal(1, j >>= 1);
-assert_equal(2, j += 1);
-assert_equal(1, --j);
-assert_equal(2, ++j);
-
diff --git a/unittests/3.x/pair.chai b/unittests/3.x/pair.chai
deleted file mode 100644
index 9b3c8049..00000000
--- a/unittests/3.x/pair.chai
+++ /dev/null
@@ -1,5 +0,0 @@
-var p = Pair("Hello", "World")
-
-assert_equal(p.first, "Hello")
-assert_equal(p.second, "World")
-
diff --git a/unittests/3.x/pointer_passed_to_constructor.chai b/unittests/3.x/pointer_passed_to_constructor.chai
deleted file mode 100644
index 6495ee38..00000000
--- a/unittests/3.x/pointer_passed_to_constructor.chai
+++ /dev/null
@@ -1,8 +0,0 @@
-load_module("test_module")
-
-var i = 1;
-var t0 = TestBaseType(i);
-
-var t1 = TestBaseType(get_new_int())
-
-
diff --git a/unittests/3.x/precedence_1.chai b/unittests/3.x/precedence_1.chai
deleted file mode 100644
index a5388625..00000000
--- a/unittests/3.x/precedence_1.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(14, 2 + 3 * 4)
diff --git a/unittests/3.x/precedence_2.chai b/unittests/3.x/precedence_2.chai
deleted file mode 100644
index 27a19d4a..00000000
--- a/unittests/3.x/precedence_2.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(-2, 5 - 4 - 3)
diff --git a/unittests/3.x/precedence_3.chai b/unittests/3.x/precedence_3.chai
deleted file mode 100644
index 6eecbf64..00000000
--- a/unittests/3.x/precedence_3.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(0, 10 / 5 % 2)
diff --git a/unittests/3.x/precedence_eq.chai b/unittests/3.x/precedence_eq.chai
deleted file mode 100644
index 325d667e..00000000
--- a/unittests/3.x/precedence_eq.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var x = var y = 4
-assert_equal(4, x);
-assert_equal(4, y);
diff --git a/unittests/3.x/product.chai b/unittests/3.x/product.chai
deleted file mode 100644
index 03ba3cfa..00000000
--- a/unittests/3.x/product.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(24, product([1, 2, 3, 4]))
diff --git a/unittests/3.x/range.chai b/unittests/3.x/range.chai
deleted file mode 100644
index ddef4f2a..00000000
--- a/unittests/3.x/range.chai
+++ /dev/null
@@ -1,4 +0,0 @@
-var x = [1, 2, 3, 4]
-var r = range(x)
-r.pop_front()
-assert_equal(2, r.front());
diff --git a/unittests/3.x/range_back.chai b/unittests/3.x/range_back.chai
deleted file mode 100644
index 6bf56721..00000000
--- a/unittests/3.x/range_back.chai
+++ /dev/null
@@ -1,4 +0,0 @@
-var x = [1, 2, 3, 4]
-var r = range(x)
-r.pop_back()
-assert_equal(3, r.back())
diff --git a/unittests/3.x/range_contains.chai b/unittests/3.x/range_contains.chai
deleted file mode 100644
index 28a99b12..00000000
--- a/unittests/3.x/range_contains.chai
+++ /dev/null
@@ -1,5 +0,0 @@
-var v = [1,2,"hi", "world", 5.5]
-assert_equal(true, v.contains(5.5))
-assert_equal(false, v.contains(0))
-assert_equal(false, v.contains(1, lt))
-assert_equal(true, v.contains(2, `==`))  
diff --git a/unittests/3.x/range_find.chai b/unittests/3.x/range_find.chai
deleted file mode 100644
index 08045e5a..00000000
--- a/unittests/3.x/range_find.chai
+++ /dev/null
@@ -1,6 +0,0 @@
-var v = [2, 1, "Hi", 5.5]
-var r = v.find("Hi");
-
-assert_equal("Hi", r.front())
-var r2 = v.find(2, `<`);
-assert_equal(1, r2.front());
diff --git a/unittests/3.x/range_inplace.chai b/unittests/3.x/range_inplace.chai
deleted file mode 100644
index d661f5de..00000000
--- a/unittests/3.x/range_inplace.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal([3,4,5,6], [3..6])
diff --git a/unittests/3.x/reduce.chai b/unittests/3.x/reduce.chai
deleted file mode 100644
index 3b255b31..00000000
--- a/unittests/3.x/reduce.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(10, reduce([1, 2, 3, 4], `+`))
diff --git a/unittests/3.x/ref_equal.chai b/unittests/3.x/ref_equal.chai
deleted file mode 100644
index 1dbb90e1..00000000
--- a/unittests/3.x/ref_equal.chai
+++ /dev/null
@@ -1,5 +0,0 @@
-var i = 3
-var j := i
-j = 4
-
-assert_equal(4, i)
diff --git a/unittests/3.x/retro.chai b/unittests/3.x/retro.chai
deleted file mode 100644
index d7f6818d..00000000
--- a/unittests/3.x/retro.chai
+++ /dev/null
@@ -1,4 +0,0 @@
-var x = [1, 2, 3, 4]
-var r = retro(range(x))
-r.pop_front()
-assert_equal(3, r.front())
diff --git a/unittests/3.x/retroretro.chai b/unittests/3.x/retroretro.chai
deleted file mode 100644
index 09af3ca7..00000000
--- a/unittests/3.x/retroretro.chai
+++ /dev/null
@@ -1,7 +0,0 @@
-var x = [1, 2, 3, 4]
-var r = retro(range(x))
-r.pop_back()
-var r2 = retro(r)
-r2.pop_front()
-assert_equal(2, r.back())
-assert_equal(3, r2.front())
diff --git a/unittests/3.x/return.chai b/unittests/3.x/return.chai
deleted file mode 100644
index 1747de90..00000000
--- a/unittests/3.x/return.chai
+++ /dev/null
@@ -1,5 +0,0 @@
-def sam() {
-  return 5
-}
-
-assert_equal(5, sam())
diff --git a/unittests/3.x/runtime_error.chai b/unittests/3.x/runtime_error.chai
deleted file mode 100644
index e1e2fc10..00000000
--- a/unittests/3.x/runtime_error.chai
+++ /dev/null
@@ -1,11 +0,0 @@
-var caught = false
-
-try {
-  throw(runtime_error("error"))
-}
-catch(e) {
-  caught = true
-  assert_equal("error", e.what())
-}
-
-assert_equal(true, caught)
diff --git a/unittests/3.x/shift.chai b/unittests/3.x/shift.chai
deleted file mode 100644
index 03f7ea3a..00000000
--- a/unittests/3.x/shift.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(8, 2 << 2)
diff --git a/unittests/3.x/string_charptr.chai b/unittests/3.x/string_charptr.chai
deleted file mode 100644
index a3065ce4..00000000
--- a/unittests/3.x/string_charptr.chai
+++ /dev/null
@@ -1,6 +0,0 @@
-assert_equal(true, "hello".c_str().is_var_const())
-assert_equal("char", "hello".c_str().type_name())
-
-assert_equal(true, "hello".data().is_var_const())
-assert_equal("char", "hello".data().type_name())
-
diff --git a/unittests/3.x/string_concat.chai b/unittests/3.x/string_concat.chai
deleted file mode 100644
index 40bf4aaf..00000000
--- a/unittests/3.x/string_concat.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal("hello, there", "hello, " + "there")
diff --git a/unittests/3.x/string_find.chai b/unittests/3.x/string_find.chai
deleted file mode 100644
index f2cc1f82..00000000
--- a/unittests/3.x/string_find.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(3, find("123abab", "ab"))
diff --git a/unittests/3.x/string_find_first_not_of.chai b/unittests/3.x/string_find_first_not_of.chai
deleted file mode 100644
index 4d5fd8d4..00000000
--- a/unittests/3.x/string_find_first_not_of.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(2, find_first_not_of("abcd", "abd"))
diff --git a/unittests/3.x/string_find_first_of.chai b/unittests/3.x/string_find_first_of.chai
deleted file mode 100644
index 0200bb2c..00000000
--- a/unittests/3.x/string_find_first_of.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(1, find_first_of("abab", "bec"))
diff --git a/unittests/3.x/string_find_last_not_of.chai b/unittests/3.x/string_find_last_not_of.chai
deleted file mode 100644
index 0090f9f9..00000000
--- a/unittests/3.x/string_find_last_not_of.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(3, find_last_not_of("abab", "ac"))
diff --git a/unittests/3.x/string_find_last_of.chai b/unittests/3.x/string_find_last_of.chai
deleted file mode 100644
index 72f0f6a0..00000000
--- a/unittests/3.x/string_find_last_of.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(3, find_last_of("abab", "bec"))
diff --git a/unittests/3.x/string_init.chai b/unittests/3.x/string_init.chai
deleted file mode 100644
index a3d11632..00000000
--- a/unittests/3.x/string_init.chai
+++ /dev/null
@@ -1 +0,0 @@
-print("bob")
diff --git a/unittests/3.x/string_literal_access.chai b/unittests/3.x/string_literal_access.chai
deleted file mode 100644
index e8943a1b..00000000
--- a/unittests/3.x/string_literal_access.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal('b', "abc"[1])
diff --git a/unittests/3.x/string_rfind.chai b/unittests/3.x/string_rfind.chai
deleted file mode 100644
index 01675f34..00000000
--- a/unittests/3.x/string_rfind.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(5, rfind("123abab", "ab"))
diff --git a/unittests/3.x/sum.chai b/unittests/3.x/sum.chai
deleted file mode 100644
index 7502ae7e..00000000
--- a/unittests/3.x/sum.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(10, sum([1, 2, 3, 4]))
diff --git a/unittests/3.x/switch_break.chai b/unittests/3.x/switch_break.chai
deleted file mode 100644
index 8d362759..00000000
--- a/unittests/3.x/switch_break.chai
+++ /dev/null
@@ -1,22 +0,0 @@
-var total = 0;
-
-switch(2) { 
-  case (1) { 
-    total += 1; 
-    break;
-  } 
-  case (2) { 
-    total += 2; 
-    break;
-  } 
-  case (3) { 
-    total += 4;
-    break;
-  } 
-  case (4) { 
-    total += 8; 
-    break;
-  } 
-}
-
-assert_equal(total, 2)
diff --git a/unittests/3.x/switch_default.chai b/unittests/3.x/switch_default.chai
deleted file mode 100644
index 8c48aa50..00000000
--- a/unittests/3.x/switch_default.chai
+++ /dev/null
@@ -1,18 +0,0 @@
-var total = 0;
-
-switch(2) { 
-  case (1) { 
-    total += 1; 
-  } 
-  case (3) { 
-    total += 4;
-  } 
-  case (4) { 
-    total += 8; 
-  } 
-  default {
-    total += 16;
-  }
-}
-
-assert_equal(total, 16)
diff --git a/unittests/3.x/switch_empty.chai b/unittests/3.x/switch_empty.chai
deleted file mode 100644
index 8d3a1669..00000000
--- a/unittests/3.x/switch_empty.chai
+++ /dev/null
@@ -1,4 +0,0 @@
-switch(true) { }
-
-// We just have to get here without error for success
-assert_equal(true, true);
diff --git a/unittests/3.x/switch_fallthru.chai b/unittests/3.x/switch_fallthru.chai
deleted file mode 100644
index 627b6493..00000000
--- a/unittests/3.x/switch_fallthru.chai
+++ /dev/null
@@ -1,18 +0,0 @@
-var total = 0;
-
-switch(2) { 
-  case (1) { 
-    total += 1; 
-  } 
-  case (2) { 
-    total += 2; 
-  } 
-  case (3) { 
-    total += 4;
-  } 
-  case (4) { 
-    total += 8; 
-  } 
-}
-
-assert_equal(total, 14); 
diff --git a/unittests/3.x/switch_fallthru_and_break.chai b/unittests/3.x/switch_fallthru_and_break.chai
deleted file mode 100644
index 3c93071b..00000000
--- a/unittests/3.x/switch_fallthru_and_break.chai
+++ /dev/null
@@ -1,19 +0,0 @@
-var total = 0;
-
-switch(2) { 
-  case (1) { 
-    total += 1; 
-  } 
-  case (2) { 
-    total += 2; 
-  } 
-  case (3) { 
-    total += 4;
-    break;
-  } 
-  case (4) { 
-    total += 8; 
-  } 
-}
-
-assert_equal(total, 6)
diff --git a/unittests/3.x/take.chai b/unittests/3.x/take.chai
deleted file mode 100644
index 5110392e..00000000
--- a/unittests/3.x/take.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(2, take([1, 2, 3, 4], 2).back())
diff --git a/unittests/3.x/take_while.chai b/unittests/3.x/take_while.chai
deleted file mode 100644
index 56a4ba22..00000000
--- a/unittests/3.x/take_while.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal([1], take_while([1, 2, 3, 4], odd))
diff --git a/unittests/3.x/type_info.chai b/unittests/3.x/type_info.chai
deleted file mode 100644
index fc2dd3e7..00000000
--- a/unittests/3.x/type_info.chai
+++ /dev/null
@@ -1,11 +0,0 @@
-assert_equal("string", string_type.name());
-assert_equal(false, string_type.is_type_const());
-assert_equal(false, string_type.is_type_reference());
-assert_equal(false, string_type.is_type_void());
-assert_equal(false, string_type.is_type_undef());
-assert_equal(false, string_type.is_type_pointer());
-assert_equal("string", "string".get_type_info().name());
-assert_equal(true, string_type.bare_equal("string".get_type_info()));
-
-assert_equal(true, "bob".is_type(string_type));
-
diff --git a/unittests/3.x/unit_test.inc b/unittests/3.x/unit_test.inc
deleted file mode 100644
index d746e7bf..00000000
--- a/unittests/3.x/unit_test.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-def assert_equal(x, y)
-{
-  if (x == y)
-  {
-    // Passes
-  } else {
-    // Fails
-    print("assert_equal failure: got " + to_string(y) + " expected " + to_string(x));
-    exit(-1);
-  }
-}
-
-def assert_false(f)
-{
-  if (f)
-  {
-    print("assert_false failure");
-    exit(-1);
-  }
-}
-
-def assert_true(f)
-{
-  if (!f)
-  {
-    print("assert_false failure");
-    exit(-1);
-  }
-}
-
-def assert_not_equal(x, y)
-{
-  if (!(x == y))
-  {
-    // Passes
-  } else {
-    // Fails
-    print("assert_not_equal failure: got " + to_string(y) + " which was not expected.");
-    exit(-1);
-  }
-}
-
-def assert_throws(desc, x)
-{
-  if (throws_exception(x))
-  {
-    // Passes
-  } else {
-    // Fails
-    print("assert_throws failure, function did not throw exception: " + to_string(desc));
-    exit(-1);
-  }
-}
diff --git a/unittests/3.x/use.chai b/unittests/3.x/use.chai
deleted file mode 100644
index efd587da..00000000
--- a/unittests/3.x/use.chai
+++ /dev/null
@@ -1,9 +0,0 @@
-use("use.inc")
-
-assert_equal("hello", greet())
-
-// Include it a second time and see if there are any errors
-use("use.inc")
-
-assert_equal("hello", greet())
-
diff --git a/unittests/3.x/use.inc b/unittests/3.x/use.inc
deleted file mode 100644
index 28970935..00000000
--- a/unittests/3.x/use.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-def greet {
-  return("hello")
-}
-
diff --git a/unittests/3.x/vector_access.chai b/unittests/3.x/vector_access.chai
deleted file mode 100644
index 34d483cd..00000000
--- a/unittests/3.x/vector_access.chai
+++ /dev/null
@@ -1,2 +0,0 @@
-var x = [1, 2, 3]
-assert_equal(3, x[2])
diff --git a/unittests/3.x/vector_erase_at.chai b/unittests/3.x/vector_erase_at.chai
deleted file mode 100644
index 9a96218f..00000000
--- a/unittests/3.x/vector_erase_at.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var x = [1, 2, 3]
-x.erase_at(1)
-assert_equal([1,3], x);
diff --git a/unittests/3.x/vector_inplace_init.chai b/unittests/3.x/vector_inplace_init.chai
deleted file mode 100644
index f16c15b3..00000000
--- a/unittests/3.x/vector_inplace_init.chai
+++ /dev/null
@@ -1,2 +0,0 @@
-var x = [1, 2, 3]
-assert_equal(3, x.size())
diff --git a/unittests/3.x/vector_insert_at.chai b/unittests/3.x/vector_insert_at.chai
deleted file mode 100644
index 4f6ec45b..00000000
--- a/unittests/3.x/vector_insert_at.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var x = [1, 2, 3]
-x.insert_at(1, 6)
-assert_equal([1,6,2,3], x);
diff --git a/unittests/3.x/vector_literal_acccess.chai b/unittests/3.x/vector_literal_acccess.chai
deleted file mode 100644
index 29a7c05f..00000000
--- a/unittests/3.x/vector_literal_acccess.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(1, [1,2,3][0])
diff --git a/unittests/3.x/vector_of_one.chai b/unittests/3.x/vector_of_one.chai
deleted file mode 100644
index f4bb01bf..00000000
--- a/unittests/3.x/vector_of_one.chai
+++ /dev/null
@@ -1,2 +0,0 @@
-var x = [1]
-assert_equal(1, x[0])
diff --git a/unittests/3.x/vector_paren_literal_access.chai b/unittests/3.x/vector_paren_literal_access.chai
deleted file mode 100644
index a0c6b966..00000000
--- a/unittests/3.x/vector_paren_literal_access.chai
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal(1, ([1,2,3])[0])
diff --git a/unittests/3.x/vector_push_back.chai b/unittests/3.x/vector_push_back.chai
deleted file mode 100644
index 715082bd..00000000
--- a/unittests/3.x/vector_push_back.chai
+++ /dev/null
@@ -1,5 +0,0 @@
-var x = [1, 2]
-x.push_back(3)
-assert_equal(3, x.size())
-assert_equal(3, x.back())
-assert_equal(1, x.front())
diff --git a/unittests/3.x/vector_push_empty.chai b/unittests/3.x/vector_push_empty.chai
deleted file mode 100644
index 29c568d1..00000000
--- a/unittests/3.x/vector_push_empty.chai
+++ /dev/null
@@ -1,4 +0,0 @@
-var bob = []
-bob.push_back(3)
-assert_equal(1, bob.size())
-assert_equal(3, bob.front())
diff --git a/unittests/3.x/zip.chai b/unittests/3.x/zip.chai
deleted file mode 100644
index d39583f2..00000000
--- a/unittests/3.x/zip.chai
+++ /dev/null
@@ -1,5 +0,0 @@
-var z = zip([1, 2, 3], [4, 5, 6])
-
-assert_equal([1,4], z[0])
-assert_equal([2,5], z[1])
-assert_equal([3,6], z[2])
diff --git a/unittests/3.x/zip_with.chai b/unittests/3.x/zip_with.chai
deleted file mode 100644
index 1fe3dd90..00000000
--- a/unittests/3.x/zip_with.chai
+++ /dev/null
@@ -1,3 +0,0 @@
-var z = zip_with(`+`, [1, 2, 3], [4, 5, 6])
-
-assert_equal([5,7,9], z)