diff --git a/tests/integration/app_deploy_overview.bats b/tests/integration/app_deploy_overview.bats
index 20bfd7fc..4a2f0fb5 100644
--- a/tests/integration/app_deploy_overview.bats
+++ b/tests/integration/app_deploy_overview.bats
@@ -38,8 +38,8 @@ teardown(){
   assert_success
 
   assert_output --partial 'NEW DEPLOY OVERVIEW'
-  assert_output --partial 'CURRENT DEPLOYMENT    N/A'
-  assert_output --partial 'ENV VERSION           N/A'
+  assert_output --partial 'CURRENT DEPLOYMENT    -'
+  assert_output --partial 'ENV VERSION           -'
   assert_output --partial "NEW DEPLOYMENT        ${latestRelease}"
   assert_output --partial "IMAGES                nginx: ${latestRelease##*+} (new)"
   assert_output --partial "CONFIGS               test_conf: v1 (new)"
@@ -57,7 +57,7 @@ teardown(){
   assert_success
 
   assert_output --partial 'NEW DEPLOY OVERVIEW'
-  assert_output --partial "CURRENT DEPLOYMENT    N/A"
+  assert_output --partial "CURRENT DEPLOYMENT    -"
   assert_output --partial "ENV VERSION           ${latestRelease}"
   assert_output --partial "NEW DEPLOYMENT        ${latestRelease}"
   assert_output --partial "IMAGES                nginx: ${latestRelease##*+} (new)"
@@ -102,7 +102,7 @@ teardown(){
   assert_success
 
   assert_output --partial 'NEW DEPLOY OVERVIEW'
-  assert_output --partial "CURRENT DEPLOYMENT    N/A"
+  assert_output --partial "CURRENT DEPLOYMENT    -"
   assert_output --partial "ENV VERSION           0.1.1+1.20.2"
   assert_output --partial "NEW DEPLOYMENT        0.1.1+1.20.2"
 
@@ -125,7 +125,7 @@ teardown(){
   assert_success
 
   assert_output --partial 'NEW DEPLOY OVERVIEW'
-  assert_output --partial "CURRENT DEPLOYMENT    N/A"
+  assert_output --partial "CURRENT DEPLOYMENT    -"
   assert_output --partial "ENV VERSION           0.1.1+1.20.2"
   assert_output --partial "NEW DEPLOYMENT        ${latestRelease}"
 
@@ -219,7 +219,7 @@ teardown(){
   assert_success
 
   assert_output --partial 'NEW DEPLOY OVERVIEW'
-  assert_output --partial "CURRENT DEPLOYMENT    N/A"
+  assert_output --partial "CURRENT DEPLOYMENT    -"
   assert_output --partial "ENV VERSION           ${latestRelease}"
   assert_output --partial "NEW DEPLOYMENT        ${headHash:0:8}"
 
diff --git a/tests/integration/app_list.bats b/tests/integration/app_list.bats
index 21aaf3f6..bba1cea5 100644
--- a/tests/integration/app_list.bats
+++ b/tests/integration/app_list.bats
@@ -174,7 +174,7 @@ teardown(){
 
   run $ABRA app ls --status
   assert_success
-  assert_output --partial "unknown server"
+  assert_output --partial "server missing context"
 }
 
 # bats test_tags=slow
diff --git a/tests/integration/app_rollback_overview.bats b/tests/integration/app_rollback_overview.bats
index 240fb0e0..2690b0d0 100644
--- a/tests/integration/app_rollback_overview.bats
+++ b/tests/integration/app_rollback_overview.bats
@@ -75,7 +75,7 @@ teardown(){
 
   assert_output --partial 'DOWNGRADE OVERVIEW'
   assert_output --partial 'CURRENT DEPLOYMENT    0.2.0+1.21.0'
-  assert_output --partial 'ENV VERSION           N/A'
+  assert_output --partial 'ENV VERSION           -'
   assert_output --partial 'NEW DEPLOYMENT        0.1.0+1.20.0'
 
   run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
diff --git a/tests/integration/app_undeploy_overview.bats b/tests/integration/app_undeploy_overview.bats
index e4bbdaf2..a7cf485e 100644
--- a/tests/integration/app_undeploy_overview.bats
+++ b/tests/integration/app_undeploy_overview.bats
@@ -36,7 +36,7 @@ teardown(){
   assert_output --partial 'UNDEPLOY OVERVIEW'
   assert_output --partial 'CURRENT DEPLOYMENT    0.1.0+1.20.0'
   assert_output --partial 'ENV VERSION           0.1.0+1.20.0'
-  assert_output --partial 'NEW DEPLOYMENT        N/A'
+  assert_output --partial 'NEW DEPLOYMENT        -'
 
   run grep -q "TYPE=$TEST_RECIPE:0.1.0+1.20.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -57,7 +57,7 @@ teardown(){
   assert_output --partial 'UNDEPLOY OVERVIEW'
   assert_output --partial "CURRENT DEPLOYMENT    ${headHash:0:8}"
   assert_output --partial "ENV VERSION           ${headHash:0:8}"
-  assert_output --partial 'NEW DEPLOYMENT        N/A'
+  assert_output --partial 'NEW DEPLOYMENT        -'
 
   run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -81,7 +81,7 @@ teardown(){
   assert_output --partial 'UNDEPLOY OVERVIEW'
   assert_output --partial "CURRENT DEPLOYMENT    ${headHash:0:8}+U"
   assert_output --partial "ENV VERSION           ${headHash:0:8}+U"
-  assert_output --partial 'NEW DEPLOYMENT        N/A'
+  assert_output --partial 'NEW DEPLOYMENT        -'
 
   run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
diff --git a/tests/integration/app_upgrade_overview.bats b/tests/integration/app_upgrade_overview.bats
index dacf23a6..f7eecc5b 100644
--- a/tests/integration/app_upgrade_overview.bats
+++ b/tests/integration/app_upgrade_overview.bats
@@ -75,7 +75,7 @@ teardown(){
 
   assert_output --partial 'UPGRADE OVERVIEW'
   assert_output --partial 'CURRENT DEPLOYMENT    0.2.0+1.21.0'
-  assert_output --partial 'ENV VERSION           N/A'
+  assert_output --partial 'ENV VERSION           -'
   assert_output --partial "NEW DEPLOYMENT        $latestRelease"
 
   run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \