Index: examples/scaling_tests/haystack/fruit_prover/Makefile
===================================================================
--- examples/scaling_tests/haystack/fruit_prover/Makefile	(revision 08b8da72eb6c21f483448e5fbd475b8ab31f9a6a)
+++ examples/scaling_tests/haystack/fruit_prover/Makefile	(revision 08b8da72eb6c21f483448e5fbd475b8ab31f9a6a)
@@ -0,0 +1,12 @@
+
+
+TEST=fruit_0 fruit_10 fruit_20 
+
+.PHONY : test clean 
+test: $(TEST)
+
+clean: 
+	@rm -rf fruit_*
+
+$(TEST) :
+	@run_one $(subst fruit_,,$@) 
Index: examples/scaling_tests/haystack/fruit_prover/base/QUERY
===================================================================
--- examples/scaling_tests/haystack/fruit_prover/base/QUERY	(revision 519e487487fcfb946577db4296eba5a2ee83c27c)
+++ examples/scaling_tests/haystack/fruit_prover/base/QUERY	(revision 08b8da72eb6c21f483448e5fbd475b8ab31f9a6a)
@@ -1,9 +1,13 @@
+
+# number of credentials, 3 + 6 + 3 x #VAL#
 
 # fruits_rt2_typed
 
-pwd=`pwd`
-
-eloc=${ABAC_PROVER_PATH}
-keyloc=$pwd
+keyloc=`pwd`
+eloc=`which abac_prover_yap | sed 's/\/abac_prover_yap//'`
+if [ "$eloc" = "" ]; then
+  echo "ERROR: abac_prover_yap is not in the search path!!!"
+  exit 1
+fi
 
 ralphs=`creddy --keyid --cert $keyloc/Ralphs_ID.pem`
Index: examples/scaling_tests/haystack/fruit_prover/base/README
===================================================================
--- examples/scaling_tests/haystack/fruit_prover/base/README	(revision 519e487487fcfb946577db4296eba5a2ee83c27c)
+++ examples/scaling_tests/haystack/fruit_prover/base/README	(revision 08b8da72eb6c21f483448e5fbd475b8ab31f9a6a)
@@ -8,4 +8,6 @@
 #  The same queries used in fruit_rt2 are run against this setup and 
 #  should  yield the same result
+# number of credentials, 3 + 6 + 3 x #VAL#
+
 
 # fruits_rt2_creddy
Index: examples/scaling_tests/haystack/fruit_prover/get_time
===================================================================
--- examples/scaling_tests/haystack/fruit_prover/get_time	(revision 519e487487fcfb946577db4296eba5a2ee83c27c)
+++ 	(revision )
@@ -1,3 +1,0 @@
-#!/bin/sh
-
-grep -s user fruit_*/fruit.time
Index: examples/scaling_tests/haystack/fruit_prover/run_clean
===================================================================
--- examples/scaling_tests/haystack/fruit_prover/run_clean	(revision 519e487487fcfb946577db4296eba5a2ee83c27c)
+++ 	(revision )
@@ -1,3 +1,0 @@
-#!/bin/sh
-
-rm -rf fruit_*
Index: examples/scaling_tests/haystack/fruit_prover/run_one
===================================================================
--- examples/scaling_tests/haystack/fruit_prover/run_one	(revision 519e487487fcfb946577db4296eba5a2ee83c27c)
+++ examples/scaling_tests/haystack/fruit_prover/run_one	(revision 08b8da72eb6c21f483448e5fbd475b8ab31f9a6a)
@@ -4,12 +4,19 @@
 noise=$1
 
+if [ -z "$noise" ]; then
+    exit
+fi 
+
+echo "---running haystack fruit_prover $noise scaling"
+
 rm -rf fruit_$noise
 mkdir fruit_$noise
+
 sed "s/#VAL#/$noise/" base/README > fruit_$noise/README
+sed "s/#VAL#/$noise/" base/QUERY > fruit_$noise/run_query
 cp base/RESULT fruit_$noise/fruit.save
-cp base/QUERY fruit_$noise/run_query
 cd fruit_$noise
 chmod +x README run_query
-./README
+./README 1>/dev/null 2>&1
 time env ABAC_CN=1 ./run_query 1>fruit.tmp 2> fruit.time
 result=`diff fruit.tmp fruit.save 2>/dev/null`
Index: examples/scaling_tests/haystack/fruit_prover/run_test
===================================================================
--- examples/scaling_tests/haystack/fruit_prover/run_test	(revision 519e487487fcfb946577db4296eba5a2ee83c27c)
+++ 	(revision )
@@ -1,55 +1,0 @@
-#!/bin/sh 
-
-run_clean
-
-echo '---running haystack fruit_prover 0 scaling'
-run_one 0  1> log 2>/dev/null
-result=`grep PASSED log 2>/dev/null`
-if [ "$result" = "" ]; then
-   echo "   ERROR"
-else   
-   echo "   PASSED"
-fi
-rm -rf log
-
-
-echo '---running haystack fruit_prover 10 scaling'
-run_one 10  1> log 2>/dev/null
-result=`grep PASSED log 2>/dev/null`
-if [ "$result" = "" ]; then
-   echo "   ERROR"
-else   
-   echo "   PASSED"
-fi
-rm -rf log
-
-echo '---running haystack fruit_prover 20 scaling'
-run_one 20  1> log 2>/dev/null
-result=`grep PASSED log 2>/dev/null`
-if [ "$result" = "" ]; then
-   echo "   ERROR"
-else   
-   echo "   PASSED"
-fi
-rm -rf log
-
-echo '---running haystack fruit_prover 30 scaling'
-run_one 30  1> log 2>/dev/null
-result=`grep PASSED log 2>/dev/null`
-if [ "$result" = "" ]; then
-   echo "   ERROR"
-else   
-   echo "   PASSED"
-fi
-rm -rf log
-
-echo '---running haystack fruit_prover 200 scaling'
-run_one 200  1> log 2>/dev/null
-result=`grep PASSED log 2>/dev/null`
-if [ "$result" = "" ]; then
-   echo "   ERROR"
-else   
-   echo "   PASSED"
-fi
-rm -rf log
-
