diff --git a/beer/beer.py b/beer/beer.py
index 2f5d8b9..ae3ddb8 100755
--- a/beer/beer.py
+++ b/beer/beer.py
@@ -15,10 +15,13 @@ app.url_map.strict_slashes = False
 @app.route('/<int(min=0, max=23):hours>/<int(min=0, max=59):minutes>')
 def index(hours=None, minutes=None):
     """ main and only app """
-    if not hours:
+
+    if hours:
+        if not minutes:
+            minutes = 0
+    else:
         hours = 17
-    if not minutes:
-        minutes = 0
+        minutes = 30
 
     data = render_template('beer.html', hours=hours, minutes=minutes)
     return data
diff --git a/staging_tests.sh b/staging_tests.sh
index 4501259..e71fcff 100644
--- a/staging_tests.sh
+++ b/staging_tests.sh
@@ -5,9 +5,21 @@ else
 fi
 echo "testing URL: ${TEST_URL}"
 
+while :
+do
+	status_code=$(curl -o /dev/null -s -w '%{http_code}' ${TEST_URL})
+	echo "status code: ${status_code}"
+	[[ ${status_code} -eq 200 ]] && break
+	[[ ${i} -gt 5 ]] && exit 1
+	echo "service not ready or in error"
+	sleep 5
+	i=$(( i+1 ))
+done
+
+
 CURL_OPTS='-s'
 # default
-curl ${CURL_OPTS} ${TEST_URL} | grep -q 'setHours( 17, 0);'
+curl ${CURL_OPTS} ${TEST_URL} | grep -q 'setHours( 17, 30);'
 [ $? -ne 0 ] && echo "Failed with default" && exit 1
 
 # set 1 parameter