diff --git a/beer/beer.py b/beer/beer.py
index 4e1ea19..4f0b0ac 100755
--- a/beer/beer.py
+++ b/beer/beer.py
@@ -18,9 +18,9 @@ def index(hours=None, minutes=None):
     if not hours:
         hours = 17
     if hours and not minutes:
-        minutes = 30
-    else:
         minutes = 0
+    else:
+        minutes = 30
 
     data = render_template('beer.html', hours=hours, minutes=minutes)
     return data
diff --git a/staging_tests.sh b/staging_tests.sh
index 65c938e..e71fcff 100644
--- a/staging_tests.sh
+++ b/staging_tests.sh
@@ -5,6 +5,18 @@ 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, 30);'