diff --git a/bin/apicall.sh b/bin/apicall.sh
new file mode 100755
index 000000000..818970a6b
--- /dev/null
+++ b/bin/apicall.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+cd "`dirname $0`"
+port=$(grep ^port= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)
+pw=$(grep ^adminAccountBase64MD5= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)
+
+if which curl &>/dev/null; then
+  curl -s --header "Authorization: realm=$pw" "http://localhost:$port/$1" > /dev/null
+elif which wget &>/dev/null; then
+  wget -q -t 1 --timeout=5 --header "Authorization: realm=$pw" "http://localhost:$port/$1" -O /dev/null
+else
+  exit 1
+fi
diff --git a/bin/searchtestmulti.sh b/bin/searchtestmulti.sh
index 09eb7d50c..bc2a18e53 100755
--- a/bin/searchtestmulti.sh
+++ b/bin/searchtestmulti.sh
@@ -1,22 +1,22 @@
 #!/bin/sh
 cd "`dirname $0`"
-./searchtest.sh searchtest.words.aa &
+./searchtest.sh ../test/words/searchtest.words.aa &
 sleep 1
-./searchtest.sh searchtest.words.ab &
+./searchtest.sh ../test/words/searchtest.words.ab &
 sleep 1
-./searchtest.sh searchtest.words.ac &
+./searchtest.sh ../test/words/searchtest.words.ac &
 sleep 1
-./searchtest.sh searchtest.words.ad &
+./searchtest.sh ../test/words/searchtest.words.ad &
 sleep 1
-./searchtest.sh searchtest.words.ae &
+./searchtest.sh ../test/words/searchtest.words.ae &
 sleep 1
-./searchtest.sh searchtest.words.af &
+./searchtest.sh ../test/words/searchtest.words.af &
 sleep 1
-./searchtest.sh searchtest.words.ag &
+./searchtest.sh ../test/words/searchtest.words.ag &
 sleep 1
-./searchtest.sh searchtest.words.ah &
+./searchtest.sh ../test/words/searchtest.words.ah &
 sleep 1
-./searchtest.sh searchtest.words.ai &
+./searchtest.sh ../test/words/searchtest.words.ai &
 sleep 1
-./searchtest.sh searchtest.words.aj &
+./searchtest.sh ../test/words/searchtest.words.aj &
 
diff --git a/stopYACY.sh b/stopYACY.sh
index 6152fa0fd..037fbf457 100755
--- a/stopYACY.sh
+++ b/stopYACY.sh
@@ -3,9 +3,7 @@ cd `dirname $0`
 
 if [ -x `which wget` ]
 then
-	port=`cat DATA/SETTINGS/yacy.conf |grep "^port="|sed "s/.*=//"`
-	pw=`cat DATA/SETTINGS/yacy.conf |grep "^adminAccountBase64MD5="|sed "s/.*=//"`
-	wget -q -t 1 --timeout=5 --header "Authorization: realm=$pw" http://localhost:$port/Steering.html?shutdown=true -O /dev/null
+	bin/apicall.sh "Steering.html?shutdown=true"
 
 echo "Please wait until the YaCy daemon process terminates"
 echo "You can monitor this with 'tail -f DATA/LOG/yacy00.log' and 'fuser log/yacy00.log'"
diff --git a/bin/searchtest.words b/test/words/searchtest.words
similarity index 100%
rename from bin/searchtest.words
rename to test/words/searchtest.words
diff --git a/bin/searchtest.words.aa b/test/words/searchtest.words.aa
similarity index 100%
rename from bin/searchtest.words.aa
rename to test/words/searchtest.words.aa
diff --git a/bin/searchtest.words.ab b/test/words/searchtest.words.ab
similarity index 100%
rename from bin/searchtest.words.ab
rename to test/words/searchtest.words.ab
diff --git a/bin/searchtest.words.ac b/test/words/searchtest.words.ac
similarity index 100%
rename from bin/searchtest.words.ac
rename to test/words/searchtest.words.ac
diff --git a/bin/searchtest.words.ad b/test/words/searchtest.words.ad
similarity index 100%
rename from bin/searchtest.words.ad
rename to test/words/searchtest.words.ad
diff --git a/bin/searchtest.words.ae b/test/words/searchtest.words.ae
similarity index 100%
rename from bin/searchtest.words.ae
rename to test/words/searchtest.words.ae
diff --git a/bin/searchtest.words.af b/test/words/searchtest.words.af
similarity index 100%
rename from bin/searchtest.words.af
rename to test/words/searchtest.words.af
diff --git a/bin/searchtest.words.ag b/test/words/searchtest.words.ag
similarity index 100%
rename from bin/searchtest.words.ag
rename to test/words/searchtest.words.ag
diff --git a/bin/searchtest.words.ah b/test/words/searchtest.words.ah
similarity index 100%
rename from bin/searchtest.words.ah
rename to test/words/searchtest.words.ah
diff --git a/bin/searchtest.words.ai b/test/words/searchtest.words.ai
similarity index 100%
rename from bin/searchtest.words.ai
rename to test/words/searchtest.words.ai
diff --git a/bin/searchtest.words.aj b/test/words/searchtest.words.aj
similarity index 100%
rename from bin/searchtest.words.aj
rename to test/words/searchtest.words.aj
diff --git a/updateYACY.sh b/updateYACY.sh
index 3d0015948..f81935b0d 100755
--- a/updateYACY.sh
+++ b/updateYACY.sh
@@ -3,9 +3,7 @@ cd `dirname $0`
 
 if [ -x `which wget` ]
 then
-	port=`cat DATA/SETTINGS/yacy.conf |grep "^port="|sed "s/.*=//"`
-	pw=`cat DATA/SETTINGS/yacy.conf |grep "^adminAccountBase64MD5="|sed "s/.*=//"`
-	wget -q -t 1 --timeout=5 --header "Authorization: realm=$pw" http://localhost:$port/ConfigUpdate_p.html?autoUpdate= -O /dev/null
+	bin/apicall.sh "ConfigUpdate_p.html?autoUpdate="
 
 elif [ -x `which java` ]
 then