diff --git a/api/test/download_api.js b/api/test/download_api.js
index 8f8e224..7aeeb87 100644
--- a/api/test/download_api.js
+++ b/api/test/download_api.js
@@ -13,7 +13,7 @@ function logAndThrow(err) {
 }
 
 describe('Yipee Download API Tests:', function() {
-    this.timeout(60000);
+    this.timeout(10000);
 
     after(function(done) {
         if (app.server) {
@@ -118,7 +118,7 @@ describe('Yipee Download API Tests:', function() {
             payload: flatYipee,
             retkey: 'helmFile',
             expectStatus: 200,
-            expectEntries: ["Chart.yaml", "values.yaml"]
+            expectEntries: ["flatYipee/Chart.yaml", "flatYipee/values.yaml"]
         }
     ];
 
diff --git a/build.sh b/build.sh
index 8770296..1065631 100644
--- a/build.sh
+++ b/build.sh
@@ -3,6 +3,6 @@ CVT_IMG=yipee-converter
 API_IMG=yipee-api
 UI_IMG=yipee-ui
 
-(cd converter; docker build -t $CVT_IMG .)
-(cd api; bash api_build.sh $CVT_IMG $API_IMG)
-(cd ui; docker build -t $UI_IMG .)
+(cd converter; docker build -t $CVT_IMG .) || exit 1
+(cd api; bash api_build.sh $CVT_IMG $API_IMG) || exit 1
+(cd ui; docker build -t $UI_IMG .) || exit 1