diff --git a/.github/workflows/test_datastream_options.yml b/.github/workflows/test_datastream_options.yml
index c40ea8a1..bb2b2862 100644
--- a/.github/workflows/test_datastream_options.yml
+++ b/.github/workflows/test_datastream_options.yml
@@ -30,26 +30,26 @@ jobs:
       run: |
         hfsubset -w medium_range -s nextgen -v 2.1.1 -l divides,flowlines,network,nexus,forcing-weights,flowpath-attributes,model-attributes -o palisade.gpkg -t hl "Gages-09106150"
 
-    - name: Base test and NWM_RETRO_V3
-      run: |        
-        sudo rm -rf $(pwd)/data/datastream_test
-        ./scripts/stream.sh -s 202006200100 -e 202006200200 -C NWM_RETRO_V3 -d $(pwd)/data/datastream_test -g $(pwd)/palisade.gpkg -R $(pwd)/configs/ngen/realization_sloth_nom_cfe_pet.json
+    # - name: Base test and NWM_RETRO_V3
+    #   run: |        
+    #     sudo rm -rf $(pwd)/data/datastream_test
+    #     ./scripts/stream.sh -s 202006200100 -e 202006200200 -C NWM_RETRO_V3 -d $(pwd)/data/datastream_test -g $(pwd)/palisade.gpkg -R $(pwd)/configs/ngen/realization_sloth_nom_cfe_pet.json
 
-    - name: Cache resource directory
-      run: |
-        mkdir ./data/cache
-        cp -r ./data/datastream_test/datastream-resources ./data/cache
-        cp -r ./data/cache/datastream-resources ./data/cache/datastream-resources-no-forcings
-        cp -r ./data/cache/datastream-resources ./data/cache/datastream-resources-missing
-        sudo rm -rf ./data/cache/datastream-resources-no-forcings/ngen-forcings 
+    # - name: Cache resource directory
+    #   run: |
+    #     mkdir ./data/cache
+    #     cp -r ./data/datastream_test/datastream-resources ./data/cache
+    #     cp -r ./data/cache/datastream-resources ./data/cache/datastream-resources-no-forcings
+    #     cp -r ./data/cache/datastream-resources ./data/cache/datastream-resources-missing
+    #     sudo rm -rf ./data/cache/datastream-resources-no-forcings/ngen-forcings 
 
-    - name: Resource directory test missing all
-      if: always()
-      run: |
-        sudo rm -rf $(pwd)/data/datastream_test
-        sudo rm -rf ./data/cache/datastream-resources-missing/ngen-forcings 
-        sudo rm -rf ./data/cache/datastream-resources-missing/config/*
-        ./scripts/stream.sh -r ./data/cache/datastream-resources-missing -R $(pwd)/configs/ngen/realization_sloth_nom_cfe_pet.json -s 202006200100 -e 202006200200 -C NWM_RETRO_V3 -d $(pwd)/data/datastream_test -g $(pwd)/palisade.gpkg
+    # - name: Resource directory test missing all
+    #   if: always()
+    #   run: |
+    #     sudo rm -rf $(pwd)/data/datastream_test
+    #     sudo rm -rf ./data/cache/datastream-resources-missing/ngen-forcings 
+    #     sudo rm -rf ./data/cache/datastream-resources-missing/config/*
+    #     ./scripts/stream.sh -r ./data/cache/datastream-resources-missing -R $(pwd)/configs/ngen/realization_sloth_nom_cfe_pet.json -s 202006200100 -e 202006200200 -C NWM_RETRO_V3 -d $(pwd)/data/datastream_test -g $(pwd)/palisade.gpkg
 
     # - name: Resource directory test
     #   if: always()
@@ -90,7 +90,7 @@ jobs:
         sudo rm -rf $(pwd)/data/datastream_test
         ./scripts/stream.sh -s 202006200100 -e 202006200200 -C NWM_RETRO_V3 -d $(pwd)/data/datastream_test -g $(pwd)/palisade.gpkg -R $(pwd)/configs/ngen/realization_sloth_nom_cfe_pet.json -S ngen-datastream -o git_actions_test/
         sudo rm -rf $(pwd)/data/datastream_test
-        aws s3api object-exists --bucket ngen-datastream --key git_actions_test/ngen-run.tar.gz   
+        aws s3api wait object-exists --bucket ngen-datastream --key git_actions_test/ngen-run.tar.gz   
         aws s3api delete-object --bucket ngen-datastream --key git_actions_test/ngen-run.tar.gz
 
     - name: DAILY today test
@@ -99,7 +99,7 @@ jobs:
         sudo rm -rf $(pwd)/data/datastream_test
         ./scripts/stream.sh -s DAILY -C NWM_RETRO_V3 -d $(pwd)/data/datastream_test -g $(pwd)/palisade.gpkg -R $(pwd)/configs/ngen/realization_sloth_nom_cfe_pet.json -S ngen-datastream -o DAILY_today_test/
         sudo rm -rf $(pwd)/data/datastream_test
-        aws s3api object-exists --bucket ngen-datastream --key DAILY_today_test/ngen-run.tar.gz   
+        aws s3api wait object-exists --bucket ngen-datastream --key DAILY_today_test/ngen-run.tar.gz   
         aws s3api delete-object --bucket ngen-datastream --key DAILY_today_test/ngen-run.tar.gz
 
     - name: DAILY pick day test
@@ -108,7 +108,7 @@ jobs:
         sudo rm -rf $(pwd)/data/datastream_test
         ./scripts/stream.sh -s DAILY -e 20200620 -C NWM_RETRO_V3 -d $(pwd)/data/datastream_test -g $(pwd)/palisade.gpkg -R $(pwd)/configs/ngen/realization_sloth_nom_cfe_pet.json -S ngen-datastream -o DAILY_pick_test/
         sudo rm -rf $(pwd)/data/datastream_test
-        aws s3api object-exists --bucket ngen-datastream --key DAILY_pick_test/ngen-run.tar.gz   
+        aws s3api wait object-exists --bucket ngen-datastream --key DAILY_pick_test/ngen-run.tar.gz   
         aws s3api delete-object --bucket ngen-datastream --key DAILY_pick_test/ngen-run.tar.gz