diff --git a/tests/autodetect.t b/tests/autodetect.t
index b9cc4b2c1569d92f4a54a62d691239326c371af8..5bc8e94f01de6d5103253d670e027d718c7b0ecd 100644
--- a/tests/autodetect.t
+++ b/tests/autodetect.t
@@ -4,11 +4,6 @@ Test autodetect
   > echo "2.4.0"
   > EOF
 
-  $ cat - > bin/Marabou << EOF
-  > #!/bin/sh
-  > echo "1.0.+"
-  > EOF
-
   $ chmod u+x bin/alt-ergo bin/pyrat.py bin/Marabou
 
   $ bin/alt-ergo
@@ -17,7 +12,7 @@ Test autodetect
   $ bin/pyrat.py --version
   PyRAT 1.1
 
-  $ bin/Marabou
+  $ bin/Marabou --version
   1.0.+
 
   $ PATH=$(pwd)/bin:$PATH
diff --git a/tests/bin/Marabou b/tests/bin/Marabou
new file mode 100644
index 0000000000000000000000000000000000000000..47211a6204fbf475ef58afcdab0e1a90682278f8
--- /dev/null
+++ b/tests/bin/Marabou
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+
+case $1 in
+    --version)
+        echo "1.0.+"
+        ;;
+    *)
+        echo "NN: $1"
+        echo "Goal:"
+        cat $2
+        echo "Unknown"
+esac
diff --git a/tests/dune b/tests/dune
index d7f5674d3b5cc9ddc76c19eb9d97f92c9c720e9e..eac4b0ca195dff598a99f13008ccbf1bacf24e70 100644
--- a/tests/dune
+++ b/tests/dune
@@ -3,4 +3,5 @@
   (package caisar)
    TestNetwork.nnet
    bin/pyrat.py
+   bin/Marabou
 ))
diff --git a/tests/marabout.t b/tests/marabout.t
index b05012d835e5698bb69e2df0c034b4446b9c8dfa..db5c02bccd1ad88e859caaf31682762d3b9ae946 100644
--- a/tests/marabout.t
+++ b/tests/marabout.t
@@ -4,11 +4,6 @@ Test verify
   > echo "2.4.0"
   > EOF
 
-  $ cat - > bin/Marabou << EOF
-  > #!/bin/sh
-  > echo "1.0.+"
-  > EOF
-
   $ chmod u+x bin/alt-ergo bin/pyrat.py bin/Marabou
 
   $ bin/alt-ergo
@@ -17,7 +12,7 @@ Test verify
   $ bin/pyrat.py --version
   PyRAT 1.1
 
-  $ bin/Marabou
+  $ bin/Marabou --version
   1.0.+
 
   $ PATH=$(pwd)/bin:$PATH
@@ -43,7 +38,14 @@ Test verify
   <autodetect>Found prover Marabou version 1.0.+, OK.
   <autodetect>Found prover PyRAT version 1.1, OK.
   <autodetect>3 prover(s) added
-  Goal G: High failure
+  Goal G: Unknown
+  ()
   Output:
-  1.0.+
+  NN: ./TestNetwork.nnet
+  Goal:
+  x0 >  0.0
+  x0 <  0.5
+  y0 >  0.0
+  y0 <  0.5
+  Unknown
   
diff --git a/tests/simple.t b/tests/simple.t
index a67656301fd0d8f73aeb3801aef55a18b02de652..7b41c27d4cfea8e64d257eb3418f3db299257035 100644
--- a/tests/simple.t
+++ b/tests/simple.t
@@ -4,11 +4,6 @@ Test verify
   > echo "2.4.0"
   > EOF
 
-  $ cat - > bin/Marabou << EOF
-  > #!/bin/sh
-  > echo "1.0.+"
-  > EOF
-
   $ chmod u+x bin/alt-ergo bin/pyrat.py bin/Marabou
 
   $ bin/alt-ergo
@@ -17,7 +12,7 @@ Test verify
   $ bin/pyrat.py --version
   PyRAT 1.1
 
-  $ bin/Marabou
+  $ bin/Marabou --version
   1.0.+
 
   $ PATH=$(pwd)/bin:$PATH