diff --git a/tests/integration/app_new.bats b/tests/integration/app_new.bats
index c3be967c..4d1f52db 100644
--- a/tests/integration/app_new.bats
+++ b/tests/integration/app_new.bats
@@ -49,7 +49,7 @@ teardown(){
 
   assert_equal $(_get_tag_hash 0.3.0+1.21.0) $(_get_current_hash)
 
-  run grep -q "TYPE=$TEST_RECIPE:0.3.0+1.21.0" \
+  run grep -q "RECIPE=$TEST_RECIPE:0.3.0+1.21.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 }
@@ -65,7 +65,7 @@ teardown(){
   currentHash=$(_get_current_hash)
   assert_equal 1e83340e ${currentHash:0:8}
 
-  run grep -q "TYPE=$TEST_RECIPE:1e83340e" \
+  run grep -q "RECIPE=$TEST_RECIPE:1e83340e" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 }
diff --git a/tests/integration/app_secret.bats b/tests/integration/app_secret.bats
index 0aaf4a4d..edb506d2 100644
--- a/tests/integration/app_secret.bats
+++ b/tests/integration/app_secret.bats
@@ -38,7 +38,6 @@ teardown(){
 
   run $ABRA app secret generate DOESNTEXIST
   assert_failure
-  assert_output --partial 'cannot find app'
 
   run $ABRA app secret generate "$TEST_APP_DOMAIN"
   assert_failure
@@ -177,19 +176,15 @@ teardown(){
 @test "insert: validate arguments" {
   run $ABRA app secret insert
   assert_failure
-  assert_output --partial 'no app provided'
 
   run $ABRA app secret insert "$TEST_APP_DOMAIN"
   assert_failure
-  assert_output --partial 'missing arguments'
 
   run $ABRA app secret insert "$TEST_APP_DOMAIN" bar
   assert_failure
-  assert_output --partial 'missing arguments'
 
   run $ABRA app secret insert "$TEST_APP_DOMAIN" bar baz
   assert_failure
-  assert_output --partial 'missing arguments'
 }
 
 @test "insert: create secret" {
@@ -227,15 +222,12 @@ teardown(){
 @test "rm: validate arguments" {
   run $ABRA app secret rm
   assert_failure
-  assert_output --partial 'no app provided'
 
   run $ABRA app secret rm DOESNTEXIST
   assert_failure
-  assert_output --partial 'cannot find app'
 
   run $ABRA app secret rm "$TEST_APP_DOMAIN"
   assert_failure
-  assert_output --partial 'no secret(s) specified'
 
   run $ABRA app secret rm "$TEST_APP_DOMAIN" test_pass_one --all
   assert_failure
@@ -287,11 +279,9 @@ teardown(){
 @test "ls: validate arguments" {
   run $ABRA app secret ls
   assert_failure
-  assert_output --partial 'no app provided'
 
   run $ABRA app secret ls DOESNTEXIST
   assert_failure
-  assert_output --partial 'cannot find app'
 }
 
 @test "ls: show secrets" {
diff --git a/tests/integration/app_volume.bats b/tests/integration/app_volume.bats
index 1cce638b..df41f118 100644
--- a/tests/integration/app_volume.bats
+++ b/tests/integration/app_volume.bats
@@ -47,11 +47,9 @@ teardown(){
 @test "rm validate app argument" {
   run $ABRA app volume rm
   assert_failure
-  assert_output --partial 'no app provided'
 
   run $ABRA app volume rm DOESNTEXIST
   assert_failure
-  assert_output --partial 'cannot find app'
 }
 
 # bats test_tags=slow
diff --git a/tests/integration/server_add.bats b/tests/integration/server_add.bats
index 2e5ba378..6de57779 100644
--- a/tests/integration/server_add.bats
+++ b/tests/integration/server_add.bats
@@ -30,7 +30,7 @@ teardown(){
 @test "error if using name and --local together" {
   run $ABRA server add "$TEST_SERVER" --local
   assert_failure
-  assert_output --partial 'cannot use <name> and --local together'
+  assert_output --partial 'cannot use [server] and --local together'
 }
 
 @test "create local server" {
diff --git a/tests/integration/server_prune.bats b/tests/integration/server_prune.bats
index 0b908df0..ba4ff1a4 100644
--- a/tests/integration/server_prune.bats
+++ b/tests/integration/server_prune.bats
@@ -18,11 +18,9 @@ setup(){
 @test "validate server" {
   run $ABRA server prune --no-input
   assert_failure
-  assert_output --partial 'no server provided'
 
   run $ABRA server prune foo
   assert_failure
-  assert_output --partial "server doesn't exist"
 }
 
 @test "prune containers, networks and images" {
diff --git a/tests/integration/server_remove.bats b/tests/integration/server_remove.bats
index 5e3ae80d..725d6337 100644
--- a/tests/integration/server_remove.bats
+++ b/tests/integration/server_remove.bats
@@ -22,11 +22,9 @@ teardown(){
 @test "validate server" {
   run $ABRA server remove --no-input
   assert_failure
-  assert_output --partial 'no server provided'
 
   run $ABRA server remove foo
   assert_failure
-  assert_output --partial "server doesn't exist"
 }
 
 @test "remove server" {