diff --git a/curconvd/test.sh b/curconvd/test.sh
index 6da5a97..1a0dd6c 100755
--- a/curconvd/test.sh
+++ b/curconvd/test.sh
@@ -1,54 +1,64 @@
 # !/bin/bash
-# This program shows how curconvd answers to d-bus requests
+# This program shows how curconvd answers to D-Bus requests
 
-SERVICE=$(qdbus | grep curconvd)
+SERVICE="org.kde.curconvd"
 
+echo "------- Methods --------------------------------"
 qdbus $SERVICE /CurrencyConverter
 echo
 
+echo "------- Data sources ---------------------------"
 qdbus $SERVICE /CurrencyConverter DataSources
 echo
+
+echo "------- Rounding methods -----------------------"
 qdbus $SERVICE /CurrencyConverter RoundingMethods
 echo
 
+echo "------- Fixed rates ----------------------------"
 qdbus $SERVICE /CurrencyConverter ReferenceCurrency    "(fixed)"
 TABLE=$(qdbus $SERVICE /CurrencyConverter LoadSource           "(fixed)" "none")
 echo $TABLE
 sleep 2
 qdbus $SERVICE $TABLE             AvailableCurrencies
 echo
 qdbus $SERVICE $TABLE             Symbol               FRF
 qdbus $SERVICE $TABLE             Name                 FRF
 echo "10 euro in French franc"
 qdbus $SERVICE $TABLE             ConvertFromReference FRF 10.0
 echo "10 French franc in euro"
 qdbus $SERVICE $TABLE             ConvertToReference   FRF 10.0
 qdbus $SERVICE $TABLE             Unload
+echo
 
+echo "------- European Commerce Bank -----------------"
 qdbus $SERVICE /CurrencyConverter ReferenceCurrency    "http://www.ecb.int"
 TABLE=$(qdbus $SERVICE /CurrencyConverter LoadSource           "http://www.ecb.int" "official rules")
 echo $TABLE
 sleep 2
 qdbus $SERVICE $TABLE             AvailableCurrencies
 echo
 qdbus $SERVICE $TABLE             Symbol               RUB
 qdbus $SERVICE $TABLE             Name                 RUB
 echo "10 euro in Russian rouble"
 qdbus $SERVICE $TABLE             ConvertFromReference RUB 10.0
 echo "10 Russian rouble in euro"
 qdbus $SERVICE $TABLE             ConvertToReference   RUB 10.0
 qdbus $SERVICE $TABLE             Unload
+echo
 
+echo "------- Time Genie -----------------------------"
 qdbus $SERVICE /CurrencyConverter ReferenceCurrency    "http://rss.timegenie.com"
 TABLE=$(qdbus $SERVICE /CurrencyConverter LoadSource           "http://rss.timegenie.com" "smallest coin")
 echo $TABLE
 sleep 2
 qdbus $SERVICE $TABLE             AvailableCurrencies
 echo
 qdbus $SERVICE $TABLE             Symbol               CAD
 qdbus $SERVICE $TABLE             Name                 CAD
 echo "10 US dollars in Canadian dollars"
 qdbus $SERVICE $TABLE             ConvertFromReference CAD 10.0
 echo "10 Canadian dollars in US dollars"
 qdbus $SERVICE $TABLE             ConvertToReference   CAD 10.0
 qdbus $SERVICE $TABLE             Unload
+echo