diff --git a/regression/Makefile b/regression/Makefile
deleted file mode 100644
index 9bba4665e..000000000
--- a/regression/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-DEBUG_FILES=stack-dump-before data-dump-before extra-roots-dump-before heap-dump-before stack-dump-after data-dump-after extra-roots-dump-after heap-dump-after
-TESTS=$(sort $(filter-out test111, $(basename $(wildcard test*.lama))))
-
-LAMAC=../src/lamac
-
-.PHONY: check $(TESTS)
-
-
-check: $(TESTS) ctest111
-
-$(TESTS): %: %.lama
-	@echo "regression/$@"
-	@cat $@.input | LAMA=../runtime $(LAMAC) -i $< > $@.log && diff $@.log orig/$@.log
-	@cat $@.input | LAMA=../runtime $(LAMAC) -ds -s $< > $@.log && diff $@.log orig/$@.log
-	@LAMA=../runtime $(LAMAC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log
-
-ctest111:
-	@echo "regression/test111"
-	@LAMA=../runtime $(LAMAC) test111.lama && cat test111.input | $(ARCH) ./test111 > test111.log && diff test111.log orig/test111.log
-
-clean:
-	$(RM) test*.log *.s *.sm *~ $(TESTS) *.i $(DEBUG_FILES) test111
-	$(MAKE) clean -C expressions
-	$(MAKE) clean -C deep-expressions
diff --git a/regression/common.ml b/regression/common.ml
deleted file mode 100644
index fa06cbe4e..000000000
--- a/regression/common.ml
+++ /dev/null
@@ -1,16 +0,0 @@
-open GT
-open Syntax
-       
-let conj = (&&)
-             
-open Embedding
-
-let state ps = List.fold_right (fun (x, v) (s, p) -> Expr.update x v s, (x =:= !? v) :: p) ps (Expr.empty, [])
-let eval  (s, p) e =
-  let orig      = Expr.eval s e in
-  let stmt      = List.fold_right (fun p s -> p |> s) p (Stmt.Write e) in
-  let [s_orig]  = eval [] stmt in
-  let [sm_orig] = SM.run [] (SM.compile stmt) in
-  if conj (orig = s_orig) (orig = sm_orig)
-  then Printf.printf "%d\n" orig
-  else Printf.printf "*** divergence: %d <?> %d <?> %d\n" orig s_orig sm_orig
diff --git a/regression/dune b/regression/dune
new file mode 100644
index 000000000..35cbf290d
--- /dev/null
+++ b/regression/dune
@@ -0,0 +1,162 @@
+; This file was autogenerated
+
+(cram (deps ../src/Driver.exe ../runtime/Std.i ../runtime32/Std.i))
+
+(cram (applies_to test001)
+  (deps test001.lama test001.input))
+(cram (applies_to test002)
+  (deps test002.lama test002.input))
+(cram (applies_to test003)
+  (deps test003.lama test003.input))
+(cram (applies_to test004)
+  (deps test004.lama test004.input))
+(cram (applies_to test005)
+  (deps test005.lama test005.input))
+(cram (applies_to test006)
+  (deps test006.lama test006.input))
+(cram (applies_to test007)
+  (deps test007.lama test007.input))
+(cram (applies_to test008)
+  (deps test008.lama test008.input))
+(cram (applies_to test009)
+  (deps test009.lama test009.input))
+(cram (applies_to test010)
+  (deps test010.lama test010.input))
+(cram (applies_to test011)
+  (deps test011.lama test011.input))
+(cram (applies_to test012)
+  (deps test012.lama test012.input))
+(cram (applies_to test013)
+  (deps test013.lama test013.input))
+(cram (applies_to test014)
+  (deps test014.lama test014.input))
+(cram (applies_to test015)
+  (deps test015.lama test015.input))
+(cram (applies_to test016)
+  (deps test016.lama test016.input))
+(cram (applies_to test017)
+  (deps test017.lama test017.input))
+(cram (applies_to test018)
+  (deps test018.lama test018.input))
+(cram (applies_to test019)
+  (deps test019.lama test019.input))
+(cram (applies_to test020)
+  (deps test020.lama test020.input))
+(cram (applies_to test021)
+  (deps test021.lama test021.input))
+(cram (applies_to test022)
+  (deps test022.lama test022.input))
+(cram (applies_to test023)
+  (deps test023.lama test023.input))
+(cram (applies_to test024)
+  (deps test024.lama test024.input))
+(cram (applies_to test025)
+  (deps test025.lama test025.input))
+(cram (applies_to test026)
+  (deps test026.lama test026.input))
+(cram (applies_to test027)
+  (deps test027.lama test027.input))
+(cram (applies_to test028)
+  (deps test028.lama test028.input))
+(cram (applies_to test029)
+  (deps test029.lama test029.input))
+(cram (applies_to test034)
+  (deps test034.lama test034.input))
+(cram (applies_to test036)
+  (deps test036.lama test036.input))
+(cram (applies_to test040)
+  (deps test040.lama test040.input))
+(cram (applies_to test041)
+  (deps test041.lama test041.input))
+(cram (applies_to test042)
+  (deps test042.lama test042.input))
+(cram (applies_to test045)
+  (deps test045.lama test045.input))
+(cram (applies_to test046)
+  (deps test046.lama test046.input))
+(cram (applies_to test050)
+  (deps test050.lama test050.input))
+(cram (applies_to test054)
+  (deps test054.lama test054.input))
+(cram (applies_to test059)
+  (deps test059.lama test059.input))
+(cram (applies_to test063)
+  (deps test063.lama test063.input))
+(cram (applies_to test072)
+  (deps test072.lama test072.input))
+(cram (applies_to test073)
+  (deps test073.lama test073.input))
+(cram (applies_to test074)
+  (deps test074.lama test074.input))
+(cram (applies_to test077)
+  (deps test077.lama test077.input))
+(cram (applies_to test078)
+  (deps test078.lama test078.input))
+(cram (applies_to test079)
+  (deps test079.lama test079.input))
+(cram (applies_to test080)
+  (deps test080.lama test080.input))
+(cram (applies_to test081)
+  (deps test081.lama test081.input))
+(cram (applies_to test082)
+  (deps test082.lama test082.input))
+(cram (applies_to test083)
+  (deps test083.lama test083.input))
+(cram (applies_to test084)
+  (deps test084.lama test084.input))
+(cram (applies_to test085)
+  (deps test085.lama test085.input))
+(cram (applies_to test086)
+  (deps test086.lama test086.input))
+(cram (applies_to test088)
+  (deps test088.lama test088.input))
+(cram (applies_to test089)
+  (deps test089.lama test089.input))
+(cram (applies_to test090)
+  (deps test090.lama test090.input))
+(cram (applies_to test091)
+  (deps test091.lama test091.input))
+(cram (applies_to test092)
+  (deps test092.lama test092.input))
+(cram (applies_to test093)
+  (deps test093.lama test093.input))
+(cram (applies_to test094)
+  (deps test094.lama test094.input))
+(cram (applies_to test095)
+  (deps test095.lama test095.input))
+(cram (applies_to test096)
+  (deps test096.lama test096.input))
+(cram (applies_to test097)
+  (deps test097.lama test097.input))
+(cram (applies_to test098)
+  (deps test098.lama test098.input))
+(cram (applies_to test099)
+  (deps test099.lama test099.input))
+(cram (applies_to test100)
+  (deps test100.lama test100.input))
+(cram (applies_to test101)
+  (deps test101.lama test101.input))
+(cram (applies_to test102)
+  (deps test102.lama test102.input))
+(cram (applies_to test103)
+  (deps test103.lama test103.input))
+(cram (applies_to test104)
+  (deps test104.lama test104.input))
+(cram (applies_to test105)
+  (deps test105.lama test105.input))
+(cram (applies_to test106)
+  (deps test106.lama test106.input))
+(cram (applies_to test107)
+  (deps test107.lama test107.input))
+(cram (applies_to test110)
+  (deps test110.lama test110.input))
+(cram (applies_to test111)
+  (deps test111.lama test111.input))
+(cram (applies_to test112)
+  (deps test112.lama test112.input))
+(cram (applies_to test801)
+  (deps test801.lama test801.input))
+(cram (applies_to test802)
+  (deps test802.lama test802.input))
+(cram (applies_to test803)
+  (deps test803.lama test803.input))
diff --git a/regression/gen.ml b/regression/gen.ml
new file mode 100644
index 000000000..b0d95b510
--- /dev/null
+++ b/regression/gen.ml
@@ -0,0 +1,35 @@
+(* Run as `ocaml gen.ml` *)
+
+let count = 1000
+
+let () =
+  Out_channel.with_open_text "dune" (fun dunech ->
+      let dprintfn fmt = Format.kasprintf (Printf.fprintf dunech "%s\n") fmt in
+      dprintfn "; This file was autogenerated\n";
+      dprintfn "(cram (deps ../src/Driver.exe ../runtime/Std.i ../runtime32/Std.i))\n";
+
+      for i = 0 to count - 1 do
+        let cram_buf = Buffer.create 100 in
+        let cram_printfn fmt =
+          Format.kasprintf (Printf.bprintf cram_buf "%s\n") fmt
+        in
+        let cram_file = ref (Printf.sprintf "test%03d.t" i) in
+        let lama_file = ref (Printf.sprintf "test%03d.lama" i) in
+        let input_file = ref (Printf.sprintf "test%03d.input" i) in
+
+
+        let found =
+          if Sys.file_exists !lama_file then (
+            cram_printfn
+              "  $ LAMA=../runtime ../src/Driver.exe -i test%03d.lama < \
+               test%03d.input"
+              i i;
+            true)
+          else   false
+        in
+        if found then (
+          dprintfn "(cram (applies_to test%03d)"            i;
+          dprintfn "  (deps %s %s))" !lama_file !input_file;
+          Out_channel.with_open_text !cram_file (fun ch ->
+              output_string ch (Buffer.contents cram_buf)))
+      done)
diff --git a/regression/orig/new_test001.log b/regression/orig/new_test001.log
deleted file mode 100644
index 8a1218a10..000000000
--- a/regression/orig/new_test001.log
+++ /dev/null
@@ -1,5 +0,0 @@
-1
-2
-3
-4
-5
diff --git a/regression/orig/new_test002.log b/regression/orig/new_test002.log
deleted file mode 100644
index f00c965d8..000000000
--- a/regression/orig/new_test002.log
+++ /dev/null
@@ -1,10 +0,0 @@
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
diff --git a/regression/orig/new_test003.log b/regression/orig/new_test003.log
deleted file mode 100644
index f00c965d8..000000000
--- a/regression/orig/new_test003.log
+++ /dev/null
@@ -1,10 +0,0 @@
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
diff --git a/regression/orig/test001.log b/regression/orig/test001.log
deleted file mode 100644
index 046626d13..000000000
--- a/regression/orig/test001.log
+++ /dev/null
@@ -1 +0,0 @@
-> > 90
diff --git a/regression/orig/test002.log b/regression/orig/test002.log
deleted file mode 100644
index fb47109a0..000000000
--- a/regression/orig/test002.log
+++ /dev/null
@@ -1 +0,0 @@
-> > 41
diff --git a/regression/orig/test003.log b/regression/orig/test003.log
deleted file mode 100644
index 0cd31035e..000000000
--- a/regression/orig/test003.log
+++ /dev/null
@@ -1,3 +0,0 @@
-> > 7
-3
-1
diff --git a/regression/orig/test004.log b/regression/orig/test004.log
deleted file mode 100644
index 1c530b30a..000000000
--- a/regression/orig/test004.log
+++ /dev/null
@@ -1 +0,0 @@
-> > 10
diff --git a/regression/orig/test005.log b/regression/orig/test005.log
deleted file mode 100644
index 22712dea8..000000000
--- a/regression/orig/test005.log
+++ /dev/null
@@ -1 +0,0 @@
-> > 11
diff --git a/regression/orig/test006.log b/regression/orig/test006.log
deleted file mode 100644
index 421c4542e..000000000
--- a/regression/orig/test006.log
+++ /dev/null
@@ -1,6 +0,0 @@
-> > 1
-1
-0
-1
-0
-0
diff --git a/regression/orig/test007.log b/regression/orig/test007.log
deleted file mode 100644
index bae29925c..000000000
--- a/regression/orig/test007.log
+++ /dev/null
@@ -1 +0,0 @@
--4
diff --git a/regression/orig/test008.log b/regression/orig/test008.log
deleted file mode 100644
index 11fbaeb6c..000000000
--- a/regression/orig/test008.log
+++ /dev/null
@@ -1 +0,0 @@
--45
diff --git a/regression/orig/test009.log b/regression/orig/test009.log
deleted file mode 100644
index d7b1c440c..000000000
--- a/regression/orig/test009.log
+++ /dev/null
@@ -1 +0,0 @@
-1024
diff --git a/regression/orig/test010.log b/regression/orig/test010.log
deleted file mode 100644
index 13e085dfa..000000000
--- a/regression/orig/test010.log
+++ /dev/null
@@ -1 +0,0 @@
-499950
diff --git a/regression/orig/test011.log b/regression/orig/test011.log
deleted file mode 100644
index 0cfbf0888..000000000
--- a/regression/orig/test011.log
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/regression/orig/test012.log b/regression/orig/test012.log
deleted file mode 100644
index 79d66d9c7..000000000
--- a/regression/orig/test012.log
+++ /dev/null
@@ -1,8 +0,0 @@
-> 0
-0
-0
-1
-1
-0
-1
-1
diff --git a/regression/orig/test013.log b/regression/orig/test013.log
deleted file mode 100644
index 87338fa01..000000000
--- a/regression/orig/test013.log
+++ /dev/null
@@ -1,8 +0,0 @@
-> 10
-11
-10
-11
-3
-2
-1
-0
diff --git a/regression/orig/test014.log b/regression/orig/test014.log
deleted file mode 100644
index 8ddc17591..000000000
--- a/regression/orig/test014.log
+++ /dev/null
@@ -1,31 +0,0 @@
-> 1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
diff --git a/regression/orig/test015.log b/regression/orig/test015.log
deleted file mode 100644
index 11048df53..000000000
--- a/regression/orig/test015.log
+++ /dev/null
@@ -1 +0,0 @@
-> 7919
diff --git a/regression/orig/test016.log b/regression/orig/test016.log
deleted file mode 100644
index 3f66fd229..000000000
--- a/regression/orig/test016.log
+++ /dev/null
@@ -1 +0,0 @@
-> 3628800
diff --git a/regression/orig/test017.log b/regression/orig/test017.log
deleted file mode 100644
index 5c1d82376..000000000
--- a/regression/orig/test017.log
+++ /dev/null
@@ -1 +0,0 @@
-> 6765
diff --git a/regression/orig/test018.log b/regression/orig/test018.log
deleted file mode 100644
index 42351e6a0..000000000
--- a/regression/orig/test018.log
+++ /dev/null
@@ -1,14 +0,0 @@
-> 2
-0
-3
-4
-5
-0
-7
-0
-11
-0
-13
-0
-17
-2
diff --git a/regression/orig/test019.log b/regression/orig/test019.log
deleted file mode 100644
index 13e085dfa..000000000
--- a/regression/orig/test019.log
+++ /dev/null
@@ -1 +0,0 @@
-499950
diff --git a/regression/orig/test020.log b/regression/orig/test020.log
deleted file mode 100644
index 11048df53..000000000
--- a/regression/orig/test020.log
+++ /dev/null
@@ -1 +0,0 @@
-> 7919
diff --git a/regression/orig/test021.log b/regression/orig/test021.log
deleted file mode 100644
index 3f66fd229..000000000
--- a/regression/orig/test021.log
+++ /dev/null
@@ -1 +0,0 @@
-> 3628800
diff --git a/regression/orig/test022.log b/regression/orig/test022.log
deleted file mode 100644
index 5c1d82376..000000000
--- a/regression/orig/test022.log
+++ /dev/null
@@ -1 +0,0 @@
-> 6765
diff --git a/regression/orig/test023.log b/regression/orig/test023.log
deleted file mode 100644
index 469bcf08d..000000000
--- a/regression/orig/test023.log
+++ /dev/null
@@ -1 +0,0 @@
-> > > > > > 35
diff --git a/regression/orig/test024.log b/regression/orig/test024.log
deleted file mode 100644
index c5707ba01..000000000
--- a/regression/orig/test024.log
+++ /dev/null
@@ -1,2 +0,0 @@
-> 3
-8
diff --git a/regression/orig/test025.log b/regression/orig/test025.log
deleted file mode 100644
index fcb2827ec..000000000
--- a/regression/orig/test025.log
+++ /dev/null
@@ -1,12 +0,0 @@
-> 1
-100
-200
-300
-2
-100
-200
-300
-3
-100
-200
-300
diff --git a/regression/orig/test026.log b/regression/orig/test026.log
deleted file mode 100644
index 2353669bc..000000000
--- a/regression/orig/test026.log
+++ /dev/null
@@ -1,21 +0,0 @@
-> 1
-100
-200
-300
-100
-200
-300
-2
-100
-200
-300
-100
-200
-300
-3
-100
-200
-300
-100
-200
-300
diff --git a/regression/orig/test027.log b/regression/orig/test027.log
deleted file mode 100644
index 8a28ae625..000000000
--- a/regression/orig/test027.log
+++ /dev/null
@@ -1,35 +0,0 @@
-> 1
-100
-200
-300
-1
-2
-100
-200
-300
-3
-100
-200
-300
-3
-4
-100
-200
-300
-5
-100
-200
-300
-5
-100
-200
-300
-100
-200
-300
-100
-200
-300
-100
-200
-300
diff --git a/regression/orig/test028.log b/regression/orig/test028.log
deleted file mode 100644
index 325578c16..000000000
--- a/regression/orig/test028.log
+++ /dev/null
@@ -1,14 +0,0 @@
-> 7
-5040
-6
-720
-5
-120
-4
-24
-3
-6
-2
-2
-1
-1
diff --git a/regression/orig/test029.log b/regression/orig/test029.log
deleted file mode 100644
index 67af2524c..000000000
--- a/regression/orig/test029.log
+++ /dev/null
@@ -1,18 +0,0 @@
-> 9
-55
-8
-34
-7
-21
-6
-13
-5
-8
-4
-5
-3
-3
-2
-2
-1
-1
diff --git a/regression/orig/test034.log b/regression/orig/test034.log
deleted file mode 100644
index 724c463e7..000000000
--- a/regression/orig/test034.log
+++ /dev/null
@@ -1,16 +0,0 @@
-> 97
-98
-99
-100
-101
-102
-103
-104
-99
-100
-101
-102
-103
-104
-105
-106
diff --git a/regression/orig/test036.log b/regression/orig/test036.log
deleted file mode 100644
index 35990fed4..000000000
--- a/regression/orig/test036.log
+++ /dev/null
@@ -1,16 +0,0 @@
-> 97
-98
-99
-100
-101
-102
-103
-104
-97
-97
-97
-97
-97
-97
-97
-97
diff --git a/regression/orig/test040.log b/regression/orig/test040.log
deleted file mode 100644
index 90e44a83b..000000000
--- a/regression/orig/test040.log
+++ /dev/null
@@ -1,4 +0,0 @@
-> 1
-2
-3
-4
diff --git a/regression/orig/test041.log b/regression/orig/test041.log
deleted file mode 100644
index 99e508a22..000000000
--- a/regression/orig/test041.log
+++ /dev/null
@@ -1,2 +0,0 @@
-> 600
-1800
diff --git a/regression/orig/test042.log b/regression/orig/test042.log
deleted file mode 100644
index ef20969cc..000000000
--- a/regression/orig/test042.log
+++ /dev/null
@@ -1,10 +0,0 @@
-> 0
-1
-2
-3
-4
-4
-4
-4
-4
-4
diff --git a/regression/orig/test045.log b/regression/orig/test045.log
deleted file mode 100644
index cd95b0ffd..000000000
--- a/regression/orig/test045.log
+++ /dev/null
@@ -1,40 +0,0 @@
-> 49
-34
-97
-98
-99
-34
-91
-93
-91
-49
-44
-32
-50
-44
-32
-51
-93
-67
-111
-110
-115
-32
-40
-49
-44
-32
-67
-111
-110
-115
-32
-40
-50
-44
-32
-78
-105
-108
-41
-41
diff --git a/regression/orig/test046.log b/regression/orig/test046.log
deleted file mode 100644
index f33ba2d92..000000000
--- a/regression/orig/test046.log
+++ /dev/null
@@ -1,13 +0,0 @@
-> 3
-3
-3
-1
-2
-3
-5
-5
-1
-2
-3
-4
-5
diff --git a/regression/orig/test050.log b/regression/orig/test050.log
deleted file mode 100644
index 042e35506..000000000
--- a/regression/orig/test050.log
+++ /dev/null
@@ -1 +0,0 @@
-> 2
diff --git a/regression/orig/test054.log b/regression/orig/test054.log
deleted file mode 100644
index 7a93c7c27..000000000
--- a/regression/orig/test054.log
+++ /dev/null
@@ -1,13 +0,0 @@
-> 105
-105
-105
-230
-105
-105
-105
-230
-105
-250
-1
-2
-3
diff --git a/regression/orig/test059.log b/regression/orig/test059.log
deleted file mode 100644
index 65234a85e..000000000
--- a/regression/orig/test059.log
+++ /dev/null
@@ -1,3 +0,0 @@
-> 0
-1
-2
diff --git a/regression/orig/test063.log b/regression/orig/test063.log
deleted file mode 100644
index ab6d7e597..000000000
--- a/regression/orig/test063.log
+++ /dev/null
@@ -1,2 +0,0 @@
-> 100
-200
diff --git a/regression/orig/test072.log b/regression/orig/test072.log
deleted file mode 100644
index 67af2524c..000000000
--- a/regression/orig/test072.log
+++ /dev/null
@@ -1,18 +0,0 @@
-> 9
-55
-8
-34
-7
-21
-6
-13
-5
-8
-4
-5
-3
-3
-2
-2
-1
-1
diff --git a/regression/orig/test073.log b/regression/orig/test073.log
deleted file mode 100644
index 325578c16..000000000
--- a/regression/orig/test073.log
+++ /dev/null
@@ -1,14 +0,0 @@
-> 7
-5040
-6
-720
-5
-120
-4
-24
-3
-6
-2
-2
-1
-1
diff --git a/regression/orig/test074.log b/regression/orig/test074.log
deleted file mode 100644
index 884b6b88a..000000000
--- a/regression/orig/test074.log
+++ /dev/null
@@ -1,36 +0,0 @@
-> 1
-2
-3
-4
-5
-6
-7
-8
-9
-2
-3
-4
-5
-6
-7
-8
-9
-10
-3
-5
-7
-9
-11
-13
-15
-17
-19
-5
-13
-29
-61
-125
-253
-509
-1021
-2045
diff --git a/regression/orig/test077.log b/regression/orig/test077.log
deleted file mode 100644
index 58b322cfb..000000000
--- a/regression/orig/test077.log
+++ /dev/null
@@ -1,6 +0,0 @@
-> 5
-6
-7
-8
-9
-10
diff --git a/regression/orig/test078.log b/regression/orig/test078.log
deleted file mode 100644
index 9876f9a7e..000000000
--- a/regression/orig/test078.log
+++ /dev/null
@@ -1,12 +0,0 @@
-> 1
-2
-3
-4
-1
-2
-3
-4
-3
-4
-1
-2
diff --git a/regression/orig/test079.log b/regression/orig/test079.log
deleted file mode 100644
index c41010416..000000000
--- a/regression/orig/test079.log
+++ /dev/null
@@ -1,6 +0,0 @@
-> 1
-1
-1
-1
-0
-0
diff --git a/regression/orig/test080.log b/regression/orig/test080.log
deleted file mode 100644
index c3c21fc91..000000000
--- a/regression/orig/test080.log
+++ /dev/null
@@ -1,3 +0,0 @@
-> 0
-100
-300
diff --git a/regression/orig/test081.log b/regression/orig/test081.log
deleted file mode 100644
index 3484555d5..000000000
--- a/regression/orig/test081.log
+++ /dev/null
@@ -1,6 +0,0 @@
-> 1
-2
-3
-100
-200
-300
diff --git a/regression/orig/test082.log b/regression/orig/test082.log
deleted file mode 100644
index b98c3e4e7..000000000
--- a/regression/orig/test082.log
+++ /dev/null
@@ -1,17 +0,0 @@
-> 1
-1
-1
-1
-1
-2
-3
-100
-3
-2
-1
-6
-5
-4
-3
-2
-1
diff --git a/regression/orig/test083.log b/regression/orig/test083.log
deleted file mode 100644
index 9536400a4..000000000
--- a/regression/orig/test083.log
+++ /dev/null
@@ -1,3 +0,0 @@
-> 7
-7
-28
diff --git a/regression/orig/test084.log b/regression/orig/test084.log
deleted file mode 100644
index 20b1d6a07..000000000
--- a/regression/orig/test084.log
+++ /dev/null
@@ -1,3 +0,0 @@
-> 55
-310
-310
diff --git a/regression/orig/test085.log b/regression/orig/test085.log
deleted file mode 100644
index 1da1496d0..000000000
--- a/regression/orig/test085.log
+++ /dev/null
@@ -1,8 +0,0 @@
-> 0
-15
-15
-1
-2
-3
-4
-5
diff --git a/regression/orig/test086.log b/regression/orig/test086.log
deleted file mode 100644
index c9c3fcf86..000000000
--- a/regression/orig/test086.log
+++ /dev/null
@@ -1,3 +0,0 @@
-> 1
-2
-3
diff --git a/regression/orig/test088.log b/regression/orig/test088.log
deleted file mode 100644
index 12decc137..000000000
--- a/regression/orig/test088.log
+++ /dev/null
@@ -1,2 +0,0 @@
-0
-3
diff --git a/regression/orig/test089.log b/regression/orig/test089.log
deleted file mode 100644
index c910c5cfb..000000000
--- a/regression/orig/test089.log
+++ /dev/null
@@ -1 +0,0 @@
-> > > 8
diff --git a/regression/orig/test090.log b/regression/orig/test090.log
deleted file mode 100644
index c03089ce6..000000000
--- a/regression/orig/test090.log
+++ /dev/null
@@ -1,3 +0,0 @@
-> 6
-7
-8
diff --git a/regression/orig/test091.log b/regression/orig/test091.log
deleted file mode 100644
index e8398dcb2..000000000
--- a/regression/orig/test091.log
+++ /dev/null
@@ -1,9 +0,0 @@
-> 1
-2
-3
-2
-3
-4
-3
-4
-5
diff --git a/regression/orig/test092.log b/regression/orig/test092.log
deleted file mode 100644
index a8d89ee1e..000000000
--- a/regression/orig/test092.log
+++ /dev/null
@@ -1,5 +0,0 @@
-> 1
-1
-1
-1
-0
diff --git a/regression/orig/test093.log b/regression/orig/test093.log
deleted file mode 100644
index 8b665ccc8..000000000
--- a/regression/orig/test093.log
+++ /dev/null
@@ -1,2 +0,0 @@
-> 11
-18
diff --git a/regression/orig/test094.log b/regression/orig/test094.log
deleted file mode 100644
index 3c41e142a..000000000
--- a/regression/orig/test094.log
+++ /dev/null
@@ -1,4 +0,0 @@
-> 5
-7
-12
--2
diff --git a/regression/orig/test095.log b/regression/orig/test095.log
deleted file mode 100644
index 3af13cd74..000000000
--- a/regression/orig/test095.log
+++ /dev/null
@@ -1 +0,0 @@
-> 5
diff --git a/regression/orig/test096.log b/regression/orig/test096.log
deleted file mode 100644
index a301ff37a..000000000
--- a/regression/orig/test096.log
+++ /dev/null
@@ -1,2 +0,0 @@
-> 2
-1
diff --git a/regression/orig/test097.log b/regression/orig/test097.log
deleted file mode 100644
index 81f75865d..000000000
--- a/regression/orig/test097.log
+++ /dev/null
@@ -1 +0,0 @@
-> 35
diff --git a/regression/orig/test098.log b/regression/orig/test098.log
deleted file mode 100644
index 5037637a6..000000000
--- a/regression/orig/test098.log
+++ /dev/null
@@ -1 +0,0 @@
-> 12
diff --git a/regression/orig/test099.log b/regression/orig/test099.log
deleted file mode 100644
index a2a5aca89..000000000
--- a/regression/orig/test099.log
+++ /dev/null
@@ -1,3 +0,0 @@
-> 1
-800
-800
diff --git a/regression/orig/test100.log b/regression/orig/test100.log
deleted file mode 100644
index d14b46a2c..000000000
--- a/regression/orig/test100.log
+++ /dev/null
@@ -1 +0,0 @@
-> 0
diff --git a/regression/orig/test101.log b/regression/orig/test101.log
deleted file mode 100644
index d14b46a2c..000000000
--- a/regression/orig/test101.log
+++ /dev/null
@@ -1 +0,0 @@
-> 0
diff --git a/regression/orig/test102.log b/regression/orig/test102.log
deleted file mode 100644
index 3af13cd74..000000000
--- a/regression/orig/test102.log
+++ /dev/null
@@ -1 +0,0 @@
-> 5
diff --git a/regression/orig/test103.log b/regression/orig/test103.log
deleted file mode 100644
index d99726f40..000000000
--- a/regression/orig/test103.log
+++ /dev/null
@@ -1 +0,0 @@
-> > > 5
diff --git a/regression/orig/test104.log b/regression/orig/test104.log
deleted file mode 100644
index c1bfc2536..000000000
--- a/regression/orig/test104.log
+++ /dev/null
@@ -1,10 +0,0 @@
-> 0
-1
-2
-3
-4
-5
-6
-7
-8
-9
diff --git a/regression/orig/test105.log b/regression/orig/test105.log
deleted file mode 100644
index b3fe0d1bc..000000000
--- a/regression/orig/test105.log
+++ /dev/null
@@ -1 +0,0 @@
-> 3
diff --git a/regression/orig/test106.log b/regression/orig/test106.log
deleted file mode 100644
index f792188e3..000000000
--- a/regression/orig/test106.log
+++ /dev/null
@@ -1,2 +0,0 @@
-> 1
-2
diff --git a/regression/orig/test107.log b/regression/orig/test107.log
deleted file mode 100644
index d14b46a2c..000000000
--- a/regression/orig/test107.log
+++ /dev/null
@@ -1 +0,0 @@
-> 0
diff --git a/regression/orig/test110.log b/regression/orig/test110.log
deleted file mode 100644
index 5f892f36d..000000000
--- a/regression/orig/test110.log
+++ /dev/null
@@ -1,6 +0,0 @@
-> 0
-0
-10
-0
-10
-100
diff --git a/regression/orig/test111.log b/regression/orig/test111.log
deleted file mode 100644
index 65c710776..000000000
--- a/regression/orig/test111.log
+++ /dev/null
@@ -1,6 +0,0 @@
-97
-98
-99
-100
-97
-98
diff --git a/regression/orig/test112.log b/regression/orig/test112.log
deleted file mode 100644
index a59fc9571..000000000
--- a/regression/orig/test112.log
+++ /dev/null
@@ -1,11 +0,0 @@
-1
-2
-5
-6
-7
-8
-5
-6
-7
-8
-3
diff --git a/regression/test.sh b/regression/test.sh
deleted file mode 100755
index 5cdc61484..000000000
--- a/regression/test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-make check
-pushd expressions && make check && popd
-pushd deep-expressions && make check && popd
-pushd x86only && make check && popd
diff --git a/regression/test000.opt b/regression/test000.opt
deleted file mode 100755
index b68fa3eb5..000000000
Binary files a/regression/test000.opt and /dev/null differ
diff --git a/regression/test001.t b/regression/test001.t
new file mode 100644
index 000000000..16fe859cb
--- /dev/null
+++ b/regression/test001.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test001.lama < test001.input
+   >  > 90
diff --git a/regression/test002.t b/regression/test002.t
new file mode 100644
index 000000000..c36961625
--- /dev/null
+++ b/regression/test002.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test002.lama < test002.input
+   >  > 41
diff --git a/regression/test003.t b/regression/test003.t
new file mode 100644
index 000000000..2d2060714
--- /dev/null
+++ b/regression/test003.t
@@ -0,0 +1,4 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test003.lama < test003.input
+   >  > 7
+  3
+  1
diff --git a/regression/test004.t b/regression/test004.t
new file mode 100644
index 000000000..9bcc18607
--- /dev/null
+++ b/regression/test004.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test004.lama < test004.input
+   >  > 10
diff --git a/regression/test005.t b/regression/test005.t
new file mode 100644
index 000000000..2efdae8f2
--- /dev/null
+++ b/regression/test005.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test005.lama < test005.input
+   >  > 11
diff --git a/regression/test006.t b/regression/test006.t
new file mode 100644
index 000000000..240b91821
--- /dev/null
+++ b/regression/test006.t
@@ -0,0 +1,7 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test006.lama < test006.input
+   >  > 1
+  1
+  0
+  1
+  0
+  0
diff --git a/regression/test007.t b/regression/test007.t
new file mode 100644
index 000000000..abddc7a51
--- /dev/null
+++ b/regression/test007.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test007.lama < test007.input
+  -4
diff --git a/regression/test008.t b/regression/test008.t
new file mode 100644
index 000000000..4962f828b
--- /dev/null
+++ b/regression/test008.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test008.lama < test008.input
+  -45
diff --git a/regression/test009.t b/regression/test009.t
new file mode 100644
index 000000000..8bc198cab
--- /dev/null
+++ b/regression/test009.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test009.lama < test009.input
+  1024
diff --git a/regression/test010.t b/regression/test010.t
new file mode 100644
index 000000000..b046d8ec5
--- /dev/null
+++ b/regression/test010.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test010.lama < test010.input
+  499950
diff --git a/regression/test011.t b/regression/test011.t
new file mode 100644
index 000000000..235e0ca3e
--- /dev/null
+++ b/regression/test011.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test011.lama < test011.input
+  2
diff --git a/regression/test012.t b/regression/test012.t
new file mode 100644
index 000000000..b8a3d94e8
--- /dev/null
+++ b/regression/test012.t
@@ -0,0 +1,9 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test012.lama < test012.input
+   > 0
+  0
+  0
+  1
+  1
+  0
+  1
+  1
diff --git a/regression/test013.t b/regression/test013.t
new file mode 100644
index 000000000..145b6a275
--- /dev/null
+++ b/regression/test013.t
@@ -0,0 +1,9 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test013.lama < test013.input
+   > 10
+  11
+  10
+  11
+  3
+  2
+  1
+  0
diff --git a/regression/test014.t b/regression/test014.t
new file mode 100644
index 000000000..a0f47c6fb
--- /dev/null
+++ b/regression/test014.t
@@ -0,0 +1,32 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test014.lama < test014.input
+   > 1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
+  1
diff --git a/regression/test015.t b/regression/test015.t
new file mode 100644
index 000000000..cbad48b85
--- /dev/null
+++ b/regression/test015.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test015.lama < test015.input
+   > 7919
diff --git a/regression/test016.t b/regression/test016.t
new file mode 100644
index 000000000..61155d80b
--- /dev/null
+++ b/regression/test016.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test016.lama < test016.input
+   > 3628800
diff --git a/regression/test017.t b/regression/test017.t
new file mode 100644
index 000000000..984817468
--- /dev/null
+++ b/regression/test017.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test017.lama < test017.input
+   > 6765
diff --git a/regression/test018.t b/regression/test018.t
new file mode 100644
index 000000000..a932bd5e3
--- /dev/null
+++ b/regression/test018.t
@@ -0,0 +1,15 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test018.lama < test018.input
+   > 2
+  0
+  3
+  4
+  5
+  0
+  7
+  0
+  11
+  0
+  13
+  0
+  17
+  2
diff --git a/regression/test019.t b/regression/test019.t
new file mode 100644
index 000000000..fc0330654
--- /dev/null
+++ b/regression/test019.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test019.lama < test019.input
+  499950
diff --git a/regression/test020.t b/regression/test020.t
new file mode 100644
index 000000000..ed64591f8
--- /dev/null
+++ b/regression/test020.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test020.lama < test020.input
+   > 7919
diff --git a/regression/test021.t b/regression/test021.t
new file mode 100644
index 000000000..546f9bdec
--- /dev/null
+++ b/regression/test021.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test021.lama < test021.input
+   > 3628800
diff --git a/regression/test022.t b/regression/test022.t
new file mode 100644
index 000000000..248a58489
--- /dev/null
+++ b/regression/test022.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test022.lama < test022.input
+   > 6765
diff --git a/regression/test023.t b/regression/test023.t
new file mode 100644
index 000000000..9afbc61b3
--- /dev/null
+++ b/regression/test023.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test023.lama < test023.input
+   >  >  >  >  >  > 35
diff --git a/regression/test024.t b/regression/test024.t
new file mode 100644
index 000000000..f71f291ed
--- /dev/null
+++ b/regression/test024.t
@@ -0,0 +1,3 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test024.lama < test024.input
+   > 3
+  8
diff --git a/regression/test025.t b/regression/test025.t
new file mode 100644
index 000000000..0f6a417b8
--- /dev/null
+++ b/regression/test025.t
@@ -0,0 +1,13 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test025.lama < test025.input
+   > 1
+  100
+  200
+  300
+  2
+  100
+  200
+  300
+  3
+  100
+  200
+  300
diff --git a/regression/test026.t b/regression/test026.t
new file mode 100644
index 000000000..b64cee1d8
--- /dev/null
+++ b/regression/test026.t
@@ -0,0 +1,22 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test026.lama < test026.input
+   > 1
+  100
+  200
+  300
+  100
+  200
+  300
+  2
+  100
+  200
+  300
+  100
+  200
+  300
+  3
+  100
+  200
+  300
+  100
+  200
+  300
diff --git a/regression/test027.t b/regression/test027.t
new file mode 100644
index 000000000..3cfdc9cda
--- /dev/null
+++ b/regression/test027.t
@@ -0,0 +1,36 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test027.lama < test027.input
+   > 1
+  100
+  200
+  300
+  1
+  2
+  100
+  200
+  300
+  3
+  100
+  200
+  300
+  3
+  4
+  100
+  200
+  300
+  5
+  100
+  200
+  300
+  5
+  100
+  200
+  300
+  100
+  200
+  300
+  100
+  200
+  300
+  100
+  200
+  300
diff --git a/regression/test028.t b/regression/test028.t
new file mode 100644
index 000000000..a38cd379c
--- /dev/null
+++ b/regression/test028.t
@@ -0,0 +1,15 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test028.lama < test028.input
+   > 7
+  5040
+  6
+  720
+  5
+  120
+  4
+  24
+  3
+  6
+  2
+  2
+  1
+  1
diff --git a/regression/test029.t b/regression/test029.t
new file mode 100644
index 000000000..3c8e3d1b4
--- /dev/null
+++ b/regression/test029.t
@@ -0,0 +1,19 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test029.lama < test029.input
+   > 9
+  55
+  8
+  34
+  7
+  21
+  6
+  13
+  5
+  8
+  4
+  5
+  3
+  3
+  2
+  2
+  1
+  1
diff --git a/regression/test034.t b/regression/test034.t
new file mode 100644
index 000000000..4b7e217a9
--- /dev/null
+++ b/regression/test034.t
@@ -0,0 +1,17 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test034.lama < test034.input
+   > 97
+  98
+  99
+  100
+  101
+  102
+  103
+  104
+  99
+  100
+  101
+  102
+  103
+  104
+  105
+  106
diff --git a/regression/test036.t b/regression/test036.t
new file mode 100644
index 000000000..3998c0fe5
--- /dev/null
+++ b/regression/test036.t
@@ -0,0 +1,17 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test036.lama < test036.input
+   > 97
+  98
+  99
+  100
+  101
+  102
+  103
+  104
+  97
+  97
+  97
+  97
+  97
+  97
+  97
+  97
diff --git a/regression/test040.t b/regression/test040.t
new file mode 100644
index 000000000..76a6b7fae
--- /dev/null
+++ b/regression/test040.t
@@ -0,0 +1,5 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test040.lama < test040.input
+   > 1
+  2
+  3
+  4
diff --git a/regression/test041.t b/regression/test041.t
new file mode 100644
index 000000000..953e9fea3
--- /dev/null
+++ b/regression/test041.t
@@ -0,0 +1,3 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test041.lama < test041.input
+   > 600
+  1800
diff --git a/regression/test042.t b/regression/test042.t
new file mode 100644
index 000000000..784d9c99a
--- /dev/null
+++ b/regression/test042.t
@@ -0,0 +1,11 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test042.lama < test042.input
+   > 0
+  1
+  2
+  3
+  4
+  4
+  4
+  4
+  4
+  4
diff --git a/regression/test045.t b/regression/test045.t
new file mode 100644
index 000000000..12f718072
--- /dev/null
+++ b/regression/test045.t
@@ -0,0 +1,41 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test045.lama < test045.input
+   > 49
+  34
+  97
+  98
+  99
+  34
+  91
+  93
+  91
+  49
+  44
+  32
+  50
+  44
+  32
+  51
+  93
+  67
+  111
+  110
+  115
+  32
+  40
+  49
+  44
+  32
+  67
+  111
+  110
+  115
+  32
+  40
+  50
+  44
+  32
+  78
+  105
+  108
+  41
+  41
diff --git a/regression/test046.t b/regression/test046.t
new file mode 100644
index 000000000..0ab3a1933
--- /dev/null
+++ b/regression/test046.t
@@ -0,0 +1,14 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test046.lama < test046.input
+   > 3
+  3
+  3
+  1
+  2
+  3
+  5
+  5
+  1
+  2
+  3
+  4
+  5
diff --git a/regression/test050.t b/regression/test050.t
new file mode 100644
index 000000000..1806c8c1b
--- /dev/null
+++ b/regression/test050.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test050.lama < test050.input
+   > 2
diff --git a/regression/test054.t b/regression/test054.t
new file mode 100644
index 000000000..b8ba38380
--- /dev/null
+++ b/regression/test054.t
@@ -0,0 +1,14 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test054.lama < test054.input
+   > 105
+  105
+  105
+  230
+  105
+  105
+  105
+  230
+  105
+  250
+  1
+  2
+  3
diff --git a/regression/test059.t b/regression/test059.t
new file mode 100644
index 000000000..d4fdcfc01
--- /dev/null
+++ b/regression/test059.t
@@ -0,0 +1,4 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test059.lama < test059.input
+   > 0
+  1
+  2
diff --git a/regression/test063.t b/regression/test063.t
new file mode 100644
index 000000000..324869734
--- /dev/null
+++ b/regression/test063.t
@@ -0,0 +1,3 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test063.lama < test063.input
+   > 100
+  200
diff --git a/regression/test072.t b/regression/test072.t
new file mode 100644
index 000000000..de6947dc0
--- /dev/null
+++ b/regression/test072.t
@@ -0,0 +1,19 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test072.lama < test072.input
+   > 9
+  55
+  8
+  34
+  7
+  21
+  6
+  13
+  5
+  8
+  4
+  5
+  3
+  3
+  2
+  2
+  1
+  1
diff --git a/regression/test073.t b/regression/test073.t
new file mode 100644
index 000000000..7896db913
--- /dev/null
+++ b/regression/test073.t
@@ -0,0 +1,15 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test073.lama < test073.input
+   > 7
+  5040
+  6
+  720
+  5
+  120
+  4
+  24
+  3
+  6
+  2
+  2
+  1
+  1
diff --git a/regression/test074.t b/regression/test074.t
new file mode 100644
index 000000000..1f8f8e865
--- /dev/null
+++ b/regression/test074.t
@@ -0,0 +1,37 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test074.lama < test074.input
+   > 1
+  2
+  3
+  4
+  5
+  6
+  7
+  8
+  9
+  2
+  3
+  4
+  5
+  6
+  7
+  8
+  9
+  10
+  3
+  5
+  7
+  9
+  11
+  13
+  15
+  17
+  19
+  5
+  13
+  29
+  61
+  125
+  253
+  509
+  1021
+  2045
diff --git a/regression/test077.t b/regression/test077.t
new file mode 100644
index 000000000..ffa587bce
--- /dev/null
+++ b/regression/test077.t
@@ -0,0 +1,7 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test077.lama < test077.input
+   > 5
+  6
+  7
+  8
+  9
+  10
diff --git a/regression/test078.t b/regression/test078.t
new file mode 100644
index 000000000..d0d87f6b1
--- /dev/null
+++ b/regression/test078.t
@@ -0,0 +1,13 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test078.lama < test078.input
+   > 1
+  2
+  3
+  4
+  1
+  2
+  3
+  4
+  3
+  4
+  1
+  2
diff --git a/regression/test079.t b/regression/test079.t
new file mode 100644
index 000000000..86b1be4e0
--- /dev/null
+++ b/regression/test079.t
@@ -0,0 +1,7 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test079.lama < test079.input
+   > 1
+  1
+  1
+  1
+  0
+  0
diff --git a/regression/test080.t b/regression/test080.t
new file mode 100644
index 000000000..7dd4b6546
--- /dev/null
+++ b/regression/test080.t
@@ -0,0 +1,4 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test080.lama < test080.input
+   > 0
+  100
+  300
diff --git a/regression/test081.t b/regression/test081.t
new file mode 100644
index 000000000..64532d478
--- /dev/null
+++ b/regression/test081.t
@@ -0,0 +1,7 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test081.lama < test081.input
+   > 1
+  2
+  3
+  100
+  200
+  300
diff --git a/regression/test082.t b/regression/test082.t
new file mode 100644
index 000000000..c83a10b24
--- /dev/null
+++ b/regression/test082.t
@@ -0,0 +1,18 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test082.lama < test082.input
+   > 1
+  1
+  1
+  1
+  1
+  2
+  3
+  100
+  3
+  2
+  1
+  6
+  5
+  4
+  3
+  2
+  1
diff --git a/regression/test083.t b/regression/test083.t
new file mode 100644
index 000000000..f2375351a
--- /dev/null
+++ b/regression/test083.t
@@ -0,0 +1,4 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test083.lama < test083.input
+   > 7
+  7
+  28
diff --git a/regression/test084.t b/regression/test084.t
new file mode 100644
index 000000000..248264dce
--- /dev/null
+++ b/regression/test084.t
@@ -0,0 +1,4 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test084.lama < test084.input
+   > 55
+  310
+  310
diff --git a/regression/test085.t b/regression/test085.t
new file mode 100644
index 000000000..81e57944d
--- /dev/null
+++ b/regression/test085.t
@@ -0,0 +1,9 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test085.lama < test085.input
+   > 0
+  15
+  15
+  1
+  2
+  3
+  4
+  5
diff --git a/regression/test086.t b/regression/test086.t
new file mode 100644
index 000000000..52604ce77
--- /dev/null
+++ b/regression/test086.t
@@ -0,0 +1,4 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test086.lama < test086.input
+   > 1
+  2
+  3
diff --git a/regression/test088.t b/regression/test088.t
new file mode 100644
index 000000000..e090b76aa
--- /dev/null
+++ b/regression/test088.t
@@ -0,0 +1,3 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test088.lama < test088.input
+  0
+  3
diff --git a/regression/test089.t b/regression/test089.t
new file mode 100644
index 000000000..5ff3b8b6c
--- /dev/null
+++ b/regression/test089.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test089.lama < test089.input
+   >  >  > 8
diff --git a/regression/test090.t b/regression/test090.t
new file mode 100644
index 000000000..378dda424
--- /dev/null
+++ b/regression/test090.t
@@ -0,0 +1,4 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test090.lama < test090.input
+   > 6
+  7
+  8
diff --git a/regression/test091.t b/regression/test091.t
new file mode 100644
index 000000000..d703619c3
--- /dev/null
+++ b/regression/test091.t
@@ -0,0 +1,10 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test091.lama < test091.input
+   > 1
+  2
+  3
+  2
+  3
+  4
+  3
+  4
+  5
diff --git a/regression/test092.t b/regression/test092.t
new file mode 100644
index 000000000..f8f6563db
--- /dev/null
+++ b/regression/test092.t
@@ -0,0 +1,6 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test092.lama < test092.input
+   > 1
+  1
+  1
+  1
+  0
diff --git a/regression/test093.t b/regression/test093.t
new file mode 100644
index 000000000..4d06b40f9
--- /dev/null
+++ b/regression/test093.t
@@ -0,0 +1,3 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test093.lama < test093.input
+   > 11
+  18
diff --git a/regression/test094.t b/regression/test094.t
new file mode 100644
index 000000000..d57d4bde3
--- /dev/null
+++ b/regression/test094.t
@@ -0,0 +1,5 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test094.lama < test094.input
+   > 5
+  7
+  12
+  -2
diff --git a/regression/test095.t b/regression/test095.t
new file mode 100644
index 000000000..8f98b32bd
--- /dev/null
+++ b/regression/test095.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test095.lama < test095.input
+   > 5
diff --git a/regression/test096.t b/regression/test096.t
new file mode 100644
index 000000000..a37d3219a
--- /dev/null
+++ b/regression/test096.t
@@ -0,0 +1,3 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test096.lama < test096.input
+   > 2
+  1
diff --git a/regression/test097.t b/regression/test097.t
new file mode 100644
index 000000000..e9b227d52
--- /dev/null
+++ b/regression/test097.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test097.lama < test097.input
+   > 35
diff --git a/regression/test098.t b/regression/test098.t
new file mode 100644
index 000000000..4869149a3
--- /dev/null
+++ b/regression/test098.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test098.lama < test098.input
+   > 12
diff --git a/regression/test099.t b/regression/test099.t
new file mode 100644
index 000000000..e25631b63
--- /dev/null
+++ b/regression/test099.t
@@ -0,0 +1,4 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test099.lama < test099.input
+   > 1
+  800
+  800
diff --git a/regression/test100.t b/regression/test100.t
new file mode 100644
index 000000000..98987a174
--- /dev/null
+++ b/regression/test100.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test100.lama < test100.input
+   > 0
diff --git a/regression/test101.t b/regression/test101.t
new file mode 100644
index 000000000..1ce66632f
--- /dev/null
+++ b/regression/test101.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test101.lama < test101.input
+   > 0
diff --git a/regression/test102.t b/regression/test102.t
new file mode 100644
index 000000000..73575c98a
--- /dev/null
+++ b/regression/test102.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test102.lama < test102.input
+   > 5
diff --git a/regression/test103.t b/regression/test103.t
new file mode 100644
index 000000000..cb08e6cf1
--- /dev/null
+++ b/regression/test103.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test103.lama < test103.input
+   >  >  > 5
diff --git a/regression/test104.t b/regression/test104.t
new file mode 100644
index 000000000..fb53d8a92
--- /dev/null
+++ b/regression/test104.t
@@ -0,0 +1,11 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test104.lama < test104.input
+   > 0
+  1
+  2
+  3
+  4
+  5
+  6
+  7
+  8
+  9
diff --git a/regression/test105.t b/regression/test105.t
new file mode 100644
index 000000000..c84d97686
--- /dev/null
+++ b/regression/test105.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test105.lama < test105.input
+   > 3
diff --git a/regression/test106.t b/regression/test106.t
new file mode 100644
index 000000000..f3b604992
--- /dev/null
+++ b/regression/test106.t
@@ -0,0 +1,3 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test106.lama < test106.input
+   > 1
+  2
diff --git a/regression/test107.t b/regression/test107.t
new file mode 100644
index 000000000..e014f90b8
--- /dev/null
+++ b/regression/test107.t
@@ -0,0 +1,2 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test107.lama < test107.input
+   > 0
diff --git a/regression/test110.t b/regression/test110.t
new file mode 100644
index 000000000..b948c7a1f
--- /dev/null
+++ b/regression/test110.t
@@ -0,0 +1,7 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test110.lama < test110.input
+   > 0
+  0
+  10
+  0
+  10
+  100
diff --git a/regression/test111.t b/regression/test111.t
new file mode 100644
index 000000000..89bd9eb3e
--- /dev/null
+++ b/regression/test111.t
@@ -0,0 +1,3 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test111.lama < test111.input
+  Error: undefined name "stringcat" at (11, 15)
+  [255]
diff --git a/regression/test112.t b/regression/test112.t
new file mode 100644
index 000000000..ce76a15e5
--- /dev/null
+++ b/regression/test112.t
@@ -0,0 +1,12 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test112.lama < test112.input
+  1
+  2
+  5
+  6
+  7
+  8
+  5
+  6
+  7
+  8
+  3
diff --git a/regression/new_test001.input b/regression/test801.input
similarity index 100%
rename from regression/new_test001.input
rename to regression/test801.input
diff --git a/regression/new_test001.lama b/regression/test801.lama
similarity index 100%
rename from regression/new_test001.lama
rename to regression/test801.lama
diff --git a/regression/test801.t b/regression/test801.t
new file mode 100644
index 000000000..2c4f231ae
--- /dev/null
+++ b/regression/test801.t
@@ -0,0 +1,6 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test801.lama < test801.input
+  1
+  2
+  3
+  4
+  5
diff --git a/regression/new_test002.input b/regression/test802.input
similarity index 100%
rename from regression/new_test002.input
rename to regression/test802.input
diff --git a/regression/new_test002.lama b/regression/test802.lama
similarity index 100%
rename from regression/new_test002.lama
rename to regression/test802.lama
diff --git a/regression/test802.t b/regression/test802.t
new file mode 100644
index 000000000..e5aed0926
--- /dev/null
+++ b/regression/test802.t
@@ -0,0 +1,11 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test802.lama < test802.input
+  1
+  2
+  3
+  4
+  5
+  6
+  7
+  8
+  9
+  10
diff --git a/regression/new_test003.input b/regression/test803.input
similarity index 100%
rename from regression/new_test003.input
rename to regression/test803.input
diff --git a/regression/new_test003.lama b/regression/test803.lama
similarity index 100%
rename from regression/new_test003.lama
rename to regression/test803.lama
diff --git a/regression/test803.t b/regression/test803.t
new file mode 100644
index 000000000..064a4a5bb
--- /dev/null
+++ b/regression/test803.t
@@ -0,0 +1,3 @@
+  $ LAMA=../runtime ../src/Driver.exe -i test803.lama < test803.input
+  Fatal error: exception Failure("int value expected (Closure ([\"unit\"], <not supported>, <not supported>))\n")
+  [2]