diff --git a/test/bench/add.lua b/test/add.lua
similarity index 100%
rename from test/bench/add.lua
rename to test/add.lua
diff --git a/test/bench/add.pl b/test/add.pl
similarity index 100%
rename from test/bench/add.pl
rename to test/add.pl
diff --git a/test/bench/add.py b/test/add.py
similarity index 100%
rename from test/bench/add.py
rename to test/add.py
diff --git a/test/bench/fib.zre b/test/bench/fib.zre
deleted file mode 100644
index 4eb78d1..0000000
--- a/test/bench/fib.zre
+++ /dev/null
@@ -1,6 +0,0 @@
-fn fib(n) {
-  if (n < 2) return n;
-  return fib(n - 2) + fib(n - 1);
-}
-
-print fib(35);
diff --git a/test/bench/fib.lua b/test/fib.lua
similarity index 100%
rename from test/bench/fib.lua
rename to test/fib.lua
diff --git a/test/bench/fib.pl b/test/fib.pl
similarity index 100%
rename from test/bench/fib.pl
rename to test/fib.pl
diff --git a/test/bench/fib.py b/test/fib.py
similarity index 100%
rename from test/bench/fib.py
rename to test/fib.py
diff --git a/test/fib.zre b/test/fib.zre
index 50d0378..4eb78d1 100644
--- a/test/fib.zre
+++ b/test/fib.zre
@@ -1,8 +1,6 @@
-fn fib(n int) {
-  if (n < 2) {
-    return n;
-  }
+fn fib(n) {
+  if (n < 2) return n;
   return fib(n - 2) + fib(n - 1);
 }
 
-print(fib(35).toS());
+print fib(35);
diff --git a/test/bench/loop.lua b/test/loop.lua
similarity index 100%
rename from test/bench/loop.lua
rename to test/loop.lua
diff --git a/test/bench/loop.pl b/test/loop.pl
similarity index 100%
rename from test/bench/loop.pl
rename to test/loop.pl
diff --git a/test/bench/loop.py b/test/loop.py
similarity index 100%
rename from test/bench/loop.py
rename to test/loop.py
diff --git a/test/bench/run.sh b/test/run.sh
similarity index 93%
rename from test/bench/run.sh
rename to test/run.sh
index 564cd49..3be0756 100755
--- a/test/bench/run.sh
+++ b/test/run.sh
@@ -34,4 +34,4 @@ print_section "Python ($FILENAME.py)"
 
 # ZRE Implementation
 print_section "zre ($FILENAME.zre)"
- echo "test input" | time ../../src/zre "$FILENAME.zre"
+ echo "test input" | time ../src/zre "$FILENAME.zre"