diff --git a/test/tests.bats b/test/tests.bats
index 3c859ec7..670e153c 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -7,7 +7,7 @@ load 'test_helper/bats-assert/load'
 
 @test "checking configuration: hostname/domainname" {
   run docker run `docker inspect --format '{{ .Config.Image }}' mail`
-  assert
+  assert_success
 }
 
 #
@@ -16,28 +16,28 @@ load 'test_helper/bats-assert/load'
 
 @test "checking process: postfix" {
   run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/lib/postfix/master'"
-  assert
+  assert_success
 }
 
 @test "checking process: amavisd-new" {
   run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/amavisd-new'"
-  assert
+  assert_success
 }
 
 @test "checking process: opendkim" {
   run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/opendkim'"
-  assert
+  assert_success
 }
 
 @test "checking process: opendmarc" {
   run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/opendmarc'"
-  assert
+  assert_success
 }
 
 @test "checking process: clamav (disabled by ENABLE_CLAMAV=0)" {
   if [ $ENABLE_CLAMAV -eq 0 ]; then
     run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/clamd'"
-    refute
+    assert_failure
   elif [ $ENABLE_CLAMAV -eq 1 ]; then
     skip
   fi
@@ -48,14 +48,14 @@ load 'test_helper/bats-assert/load'
     skip
   elif [ $ENABLE_CLAMAV -eq 1 ]; then
     run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/clamd'"
-    assert
+    assert_success
   fi
 }
 
 @test "checking process: fail2ban (disabled by ENABLE_FAIL2BAN=0)" {
   if [ $ENABLE_FAIL2BAN -eq 0 ]; then
     run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/bin/python /usr/bin/fail2ban-server'"
-    refute
+    assert_failure
   elif [ $ENABLE_FAIL2BAN -eq 1 ]; then
     skip
   fi
@@ -66,14 +66,14 @@ load 'test_helper/bats-assert/load'
     skip
   elif [ $ENABLE_FAIL2BAN -eq 1 ]; then
     run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/bin/python /usr/bin/fail2ban-server'"
-    assert
+    assert_success
   fi
 }
 
 @test "checking process: fetchmail (disabled by ENABLE_FETCHMAIL=0)" {
   if [ $ENABLE_FETCHMAIL -eq 0 ]; then
     run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/bin/fetchmail'"
-    refute
+    assert_failure
   elif [ $ENABLE_FETCHMAIL -eq 1 ]; then
     skip
   fi
@@ -84,14 +84,14 @@ load 'test_helper/bats-assert/load'
     skip
   elif [ $ENABLE_FETCHMAIL -eq 1 ]; then
     run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/bin/fetchmail'"
-    assert
+    assert_success
   fi
 }
 
 @test "checking process: saslauthd (disabled by ENABLE_SASLAUTHD=0)" {
   if [ $ENABLE_SASLAUTHD -eq 0 ]; then
     run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/saslauthd'"
-    refute
+    assert_failure
   elif [ $ENABLE_SASLAUTHD -eq 1 ]; then
     skip
   fi
@@ -102,7 +102,7 @@ load 'test_helper/bats-assert/load'
     skip
   elif [ $ENABLE_SASLAUTHD -eq 1 ]; then
     run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/saslauthd'"
-    assert
+    assert_success
   fi
 }
 
@@ -124,7 +124,7 @@ load 'test_helper/bats-assert/load'
     skip  
   elif [ $SMTP_ONLY -eq 1 ]; then
     run docker exec mail /bin/bash -c "ps aux --forest | grep -v grep | grep '/usr/sbin/dovecot'"
-    refute
+    assert_failure
   fi
 }
 
@@ -133,7 +133,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/bash -c "nc -w 2 0.0.0.0 143 | grep '* OK' | grep 'STARTTLS' | grep 'ready'"
-  assert
+  assert_success
 }
 
 @test "checking imap: authentication works" {
@@ -141,7 +141,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "nc -w 1 0.0.0.0 143 < /tmp/docker-mailserver-test/auth/imap-auth.txt"
-  assert
+  assert_success
 }
 
 #
@@ -153,7 +153,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/bash -c "nc -w 1 0.0.0.0 110 | grep '+OK'"
-  assert
+  assert_success
 }
 
 @test "checking pop: authentication works" {
@@ -161,7 +161,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "nc -w 1 0.0.0.0 110 < /tmp/docker-mailserver-test/auth/pop3-auth.txt"
-  assert
+  assert_success
 }
 
 #
@@ -173,7 +173,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "doveadm auth test -x service=smtp user2@otherdomain.tld mypassword | grep 'auth succeeded'"
-  assert
+  assert_success
 }
 
 @test "checking sasl: doveadm auth test fails with bad password" {
@@ -181,7 +181,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "doveadm auth test -x service=smtp user2@otherdomain.tld BADPASSWORD | grep 'auth failed'"
-  assert
+  assert_success
 }
 
 @test "checking sasl: sasl_passwd exists" {
@@ -189,7 +189,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail [ -f /etc/postfix/sasl_passwd ]
-  assert
+  assert_success
 }
 
 #
@@ -208,22 +208,22 @@ load 'test_helper/bats-assert/load'
 
 @test "checking smtp: authentication works with good password (plain)" {
   run docker exec mail /bin/sh -c "nc -w 5 0.0.0.0 25 < /tmp/docker-mailserver-test/auth/smtp-auth-plain.txt | grep 'Authentication successful'"
-  assert
+  assert_success
 }
 
 @test "checking smtp: authentication fails with wrong password (plain)" {
   run docker exec mail /bin/sh -c "nc -w 20 0.0.0.0 25 < /tmp/docker-mailserver-test/auth/smtp-auth-plain-wrong.txt | grep 'authentication failed'"
-  assert
+  assert_success
 }
 
 @test "checking smtp: authentication works with good password (login)" {
   run docker exec mail /bin/sh -c "nc -w 5 0.0.0.0 25 < /tmp/docker-mailserver-test/auth/smtp-auth-login.txt | grep 'Authentication successful'"
-  assert
+  assert_success
 }
 
 @test "checking smtp: authentication fails with wrong password (login)" {
   run docker exec mail /bin/sh -c "nc -w 20 0.0.0.0 25 < /tmp/docker-mailserver-test/auth/smtp-auth-login-wrong.txt | grep 'authentication failed'"
-  assert
+  assert_success
 }
 
 @test "checking smtp: delivers mail to existing account" {
@@ -283,7 +283,7 @@ load 'test_helper/bats-assert/load'
 
 @test "checking accounts: user accounts" {
   run docker exec mail doveadm user '*'
-  assert
+  assert_success
   [ "${lines[0]}" = "user1@localhost.localdomain" ]
   [ "${lines[1]}" = "user2@otherdomain.tld" ]
 }
@@ -304,7 +304,7 @@ load 'test_helper/bats-assert/load'
 
 @test "checking postfix: vhost file is correct" {
   run docker exec mail cat /etc/postfix/vhost
-  assert
+  assert_success
   [ "${lines[0]}" = "localdomain2.com" ]
   [ "${lines[1]}" = "localhost.localdomain" ]
   [ "${lines[2]}" = "otherdomain.tld" ]
@@ -312,9 +312,9 @@ load 'test_helper/bats-assert/load'
 
 @test "checking postfix: main.cf overrides" {
   run docker exec mail grep -q 'max_idle = 600s' /tmp/docker-mailserver/postfix-main.cf
-  assert
+  assert_success
   run docker exec mail grep -q 'readme_directory = /tmp' /tmp/docker-mailserver/postfix-main.cf
-  assert
+  assert_success
 }
 
 #
@@ -323,7 +323,7 @@ load 'test_helper/bats-assert/load'
 
 @test "checking dovecot: config additions" {
   run docker exec mail grep -q 'mail_max_userip_connections = 69' /tmp/docker-mailserver/dovecot.cf
-  assert
+  assert_success
   run docker exec mail /bin/sh -c "doveconf | grep 'mail_max_userip_connections = 69'"
   assert_output 'mail_max_userip_connections = 69'
 }
@@ -337,7 +337,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "grep -i 'ANTI-SPAM-SA code' /var/log/mail/mail.log | grep 'NOT loaded'"
-  refute
+  assert_failure
 }
 
 @test "checking spamassassin: should not be listed in amavis when disabled" {
@@ -345,7 +345,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "grep -i 'ANTI-SPAM-SA code' /var/log/mail/mail.log | grep 'NOT loaded'"
-  assert
+  assert_success
 }
 
 @test "checking spamassassin: docker env variables are set correctly (default)" {
@@ -353,11 +353,11 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "grep '\$sa_tag_level_deflt' /etc/amavis/conf.d/20-debian_defaults | grep '= 2.0'"
-  assert
+  assert_success
   run docker exec mail /bin/sh -c "grep '\$sa_tag2_level_deflt' /etc/amavis/conf.d/20-debian_defaults | grep '= 6.31'"
-  assert
+  assert_success
   run docker exec mail /bin/sh -c "grep '\$sa_kill_level_deflt' /etc/amavis/conf.d/20-debian_defaults | grep '= 6.31'"
-  assert
+  assert_success
 }
 
 @test "checking spamassassin: docker env variables are set correctly (custom)" {
@@ -365,11 +365,11 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "grep '\$sa_tag_level_deflt' /etc/amavis/conf.d/20-debian_defaults | grep '= 1.0'"
-  assert
+  assert_success
   run docker exec mail /bin/sh -c "grep '\$sa_tag2_level_deflt' /etc/amavis/conf.d/20-debian_defaults | grep '= 2.0'"
-  assert
+  assert_success
   run docker exec mail /bin/sh -c "grep '\$sa_kill_level_deflt' /etc/amavis/conf.d/20-debian_defaults | grep '= 3.0'"
-  assert
+  assert_success
 }
 
 #
@@ -381,7 +381,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail grep -i 'Found secondary av scanner ClamAV-clamscan' /var/log/mail/mail.log
-  assert
+  assert_success
 }
 
 @test "checking clamav: should not be listed in amavis when disabled" {
@@ -389,7 +389,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail grep -i 'Found secondary av scanner ClamAV-clamscan' /var/log/mail/mail.log
-  refute
+  assert_failure
 }
 
 @test "checking clamav: should not be called when disabled" {
@@ -397,7 +397,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail grep -i 'connect to /var/run/clamav/clamd.ctl failed' /var/log/mail/mail.log
-  refute
+  assert_failure
 }
 
 #
@@ -497,12 +497,12 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "timeout 1 openssl s_client -connect 0.0.0.0:587 -starttls smtp -CApath /etc/ssl/certs/ | grep 'Verify return code: 0 (ok)'"
-  assert
+  assert_success
 }
 
 @test "checking ssl: lets-encrypt-x3-cross-signed.pem is installed" {
   run docker exec mail grep 'BEGIN CERTIFICATE' /etc/ssl/certs/lets-encrypt-x3-cross-signed.pem
-  assert
+  assert_success
 }
 
 @test "checking ssl: letsencrypt configuration is correct" {
@@ -519,7 +519,7 @@ load 'test_helper/bats-assert/load'
 @test "checking ssl: letsencrypt cert works correctly" {
   if [ $SSL_TYPE = "letsencrypt" ]; then
     run docker exec mail /bin/sh -c "timeout 1 openssl s_client -connect 0.0.0.0:587 -starttls smtp -CApath /etc/ssl/certs/ | grep 'Verify return code: 10 (certificate has expired)'"
-    assert
+    assert_success
   else
     skip
   fi
@@ -543,9 +543,9 @@ load 'test_helper/bats-assert/load'
 @test "checking ssl: manual configuration copied files correctly " {
   if [ $SSL_TYPE = "manual" ]; then
     run docker exec mail /bin/sh -c 'cmp -s /etc/postfix/ssl/cert /tmp/docker-mailserver/letsencrypt/mail.my-domain.com/fullchain.pem'
-    assert
+    assert_success
     run docker exec mail /bin/sh -c 'cmp -s /etc/postfix/ssl/key /tmp/docker-mailserver/letsencrypt/mail.my-domain.com/privkey.pem'
-    assert
+    assert_success
   else
     skip
   fi
@@ -554,7 +554,7 @@ load 'test_helper/bats-assert/load'
 @test "checking ssl: manual cert works correctly" {
   if [ $SSL_TYPE = "manual" ]; then
     run docker exec mail /bin/sh -c "timeout 1 openssl s_client -connect 0.0.0.0:587 -starttls smtp -CApath /etc/ssl/certs/ | grep 'Verify return code: 10 (certificate has expired)'"
-    assert
+    assert_success
   else
     skip
   fi
@@ -569,7 +569,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "fail2ban-client status postfix-sasl | grep 'IP list:.*127.0.0.1'"
-  refute
+  assert_failure
   run docker exec mail /bin/sh -c "grep 'ignoreip = 127.0.0.1/8' /etc/fail2ban/jail.conf"
   assert
 }
@@ -611,11 +611,11 @@ load 'test_helper/bats-assert/load'
   FAIL_AUTH_MAILER_IP=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' fail-auth-mailer)
 
   run docker exec mail /bin/sh -c "fail2ban-client status postfix-sasl | grep '$FAIL_AUTH_MAILER_IP'"
-  assert
+  assert_success
 
   # Checking that FAIL_AUTH_MAILER_IP is banned by iptables
   run docker exec mail /bin/sh -c "iptables -L f2b-postfix-sasl -n | grep REJECT | grep '$FAIL_AUTH_MAILER_IP'"
-  assert
+  assert_success
 }
 
 @test "checking fail2ban: unban ip works" {
@@ -629,11 +629,11 @@ load 'test_helper/bats-assert/load'
   sleep 5
 
   run docker exec mail /bin/sh -c "fail2ban-client status postfix-sasl | grep 'IP list:.*$FAIL_AUTH_MAILER_IP'"
-  refute
+  assert_failure
 
   # Checking that FAIL_AUTH_MAILER_IP is unbanned by iptables
   run docker exec mail /bin/sh -c "iptables -L f2b-postfix-sasl -n | grep REJECT | grep '$FAIL_AUTH_MAILER_IP'"
-  refute
+  assert_failure
 }
 
 #
@@ -645,7 +645,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail grep 'set syslog' /etc/fetchmailrc
-  assert
+  assert_success
 }
 
 @test "checking fetchmail: fetchmail.cf is loaded" {
@@ -653,7 +653,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail grep 'pop3.example.tld' /etc/fetchmailrc
-  assert
+  assert_success
 }
 
 #
@@ -662,55 +662,55 @@ load 'test_helper/bats-assert/load'
 
 @test "checking system: freshclam cron is enabled" {
   run docker exec mail bash -c "crontab -l | grep '/usr/bin/freshclam'"
-  assert
+  assert_success
 }
 
 @test "checking amavis: virusmail wiper cron exists" {
   run docker exec mail bash -c "crontab -l | grep '/var/lib/amavis/virusmails/'"
-  assert
+  assert_success
 }
 
 @test "checking amavis: VIRUSMAILS_DELETE_DELAY override works as expected" {
   run docker run -ti --rm -e VIRUSMAILS_DELETE_DELAY=2 `docker inspect --format '{{ .Config.Image }}' mail` /bin/bash -c 'echo $VIRUSMAILS_DELETE_DELAY | grep 2' 
-  assert
+  assert_success
 }
 
 @test "checking amavis: old virusmail is wipped by cron" {
   docker exec mail bash -c 'touch -d "`date --date=2000-01-01`" /var/lib/amavis/virusmails/should-be-deleted'
   run docker exec -ti mail bash -c 'find /var/lib/amavis/virusmails/ -type f -mtime +$VIRUSMAILS_DELETE_DELAY -delete'
-  assert
+  assert_success
   run docker exec mail bash -c 'ls -la /var/lib/amavis/virusmails/ | grep should-be-deleted'
-  refute
+  assert_failure
 }
 
 @test "checking amavis: recent virusmail is not wipped by cron" {
   docker exec mail bash -c 'touch -d "`date`"  /var/lib/amavis/virusmails/should-not-be-deleted'
   run docker exec -ti mail bash -c 'find /var/lib/amavis/virusmails/ -type f -mtime +$VIRUSMAILS_DELETE_DELAY -delete'
-  assert
+  assert_success
   run docker exec mail bash -c 'ls -la /var/lib/amavis/virusmails/ | grep should-not-be-deleted'
-  assert
+  assert_success
 }
 
 @test "checking system: /var/log/mail/mail.log is error free" {
   run docker exec mail grep 'non-null host address bits in' /var/log/mail/mail.log
-  refute
+  assert_failure
   run docker exec mail grep 'mail system configuration error' /var/log/mail/mail.log
-  refute
+  assert_failure
   run docker exec mail grep ': error:' /var/log/mail/mail.log
-  refute
+  assert_failure
   run docker exec mail grep -i 'is not writable' /var/log/mail/mail.log
-  refute
+  assert_failure
   run docker exec mail grep -i 'permission denied' /var/log/mail/mail.log
-  refute
+  assert_failure
   run docker exec mail grep -i '(!)connect' /var/log/mail/mail.log
-  refute
+  assert_failure
   run docker exec mail grep 'non-null host address bits in' /var/log/mail/mail.log
-  refute
+  assert_failure
 }
 
 @test "checking system: /var/log/auth.log is error free" {
   run docker exec mail grep 'Unable to open env file: /etc/default/locale' /var/log/auth.log
-  refute
+  assert_failure
 }
 
 @test "checking system: sets the server fqdn" {
@@ -725,7 +725,7 @@ load 'test_helper/bats-assert/load'
 
 @test "checking system: postfix should not log to syslog" {
   run docker exec mail grep 'postfix' /var/log/syslog
-  refute
+  assert_failure
 }
 
 #
@@ -745,7 +745,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/bash -c "nc -z 0.0.0.0 4190"
-  assert
+  assert_success
 }
 
 @test "checking manage sieve: disabled per default" {
@@ -753,7 +753,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/bash -c "nc -z 0.0.0.0 4190"
-  [ "$status" -ne 0 ]
+  assert_failure
 }
 
 #
@@ -764,7 +764,7 @@ load 'test_helper/bats-assert/load'
   docker exec mail /bin/sh -c "addmailuser user3@domain.tld mypassword"
 
   run docker exec mail /bin/sh -c "grep '^user3@domain\.tld|' -i /tmp/docker-mailserver/postfix-accounts.cf"
-  assert
+  assert_success
   [ ! -z "$output" ]
 }
 
@@ -788,11 +788,11 @@ load 'test_helper/bats-assert/load'
   docker exec mail /bin/sh -c "delmailuser user3@domain.tld"
 
   run docker exec mail /bin/sh -c "grep user3@domain.tld -i /tmp/docker-mailserver/postfix-accounts.cf"
-  refute
+  assert_failure
   [ -z "$output" ]
 
   run docker exec mail /bin/sh -c "grep '^auser3@domain\.tld' -i /tmp/docker-mailserver/postfix-accounts.cf"
-  assert
+  assert_success
   [ ! -z "$output" ]
 }
 
@@ -813,7 +813,7 @@ load 'test_helper/bats-assert/load'
 
   docker exec mail /bin/sh -c "delmailuser auser3@domain.tld"
 
-  assert
+  assert_success
 }
 
 
@@ -826,7 +826,7 @@ load 'test_helper/bats-assert/load'
   run docker run --rm \
     -v "$(pwd)/test/config/without-accounts/":/tmp/docker-mailserver/ \
     `docker inspect --format '{{ .Config.Image }}' mail` /bin/sh -c 'delmailuser user3@domain.tld'
-  assert
+  assert_success
   [ -z "$output" ]
 }
 
@@ -838,7 +838,7 @@ load 'test_helper/bats-assert/load'
   run docker run --rm \
     -v "$(pwd)/test/config/without-accounts/":/tmp/docker-mailserver/ \
     `docker inspect --format '{{ .Config.Image }}' mail` /bin/sh -c 'grep user3@domain.tld -i /tmp/docker-mailserver/postfix-accounts.cf'
-  assert
+  assert_success
   [ ! -z "$output" ]
 }
 
@@ -848,21 +848,21 @@ load 'test_helper/bats-assert/load'
 
 @test "checking PERMIT_DOCKER: can get container ip" {
   run docker exec mail /bin/sh -c "ip addr show eth0 | grep 'inet ' | sed 's/[^0-9\.\/]*//g' | cut -d '/' -f 1 | egrep '[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}'"
-  assert
+  assert_success
 }
 
 @test "checking PERMIT_DOCKER: opendmarc/opendkim config" {
   run docker exec mail /bin/sh -c "cat /etc/opendmarc/ignore.hosts | grep '172.16.0.0/12'"
-  assert
+  assert_success
   run docker exec mail /bin/sh -c "cat /etc/opendkim/TrustedHosts | grep '172.16.0.0/12'"
-  assert
+  assert_success
 }
 
 @test "checking PERMIT_DOCKER: my network value" {
   run docker exec mail /bin/sh -c "postconf | grep '^mynetworks =' | egrep '[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.0\.0/16'"
-  assert
+  assert_success
   run docker exec mail /bin/sh -c "postconf | grep '^mynetworks =' | egrep '[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}/32'"
-  assert
+  assert_success
 }
 
 #
@@ -881,25 +881,25 @@ load 'test_helper/bats-assert/load'
 # CLI interface
 @test "checking setup.sh: Without arguments: status 1, show help text" {
   run ./setup.sh
-  refute
+  assert_failure
   [ "${lines[0]}" = "Usage: ./setup.sh [-i IMAGE_NAME] [-c CONTAINER_NAME] <subcommand> <subcommand> [args]" ]
 }
 @test "checking setup.sh: Wrong arguments" {
   run ./setup.sh lol troll
-  refute
+  assert_failure
   [ "${lines[0]}" = "Usage: ./setup.sh [-i IMAGE_NAME] [-c CONTAINER_NAME] <subcommand> <subcommand> [args]" ]
 }
 
 # email
 @test "checking setup.sh: setup.sh email add " {
   run ./setup.sh -c mail email add lorem@impsum.org dolorsit
-  assert
+  assert_success
   value=$(cat ./config/postfix-accounts.cf | grep lorem@impsum.org | awk -F '|' '{print $1}')
   [ "$value" = "lorem@impsum.org" ]
 }
 @test "checking setup.sh: setup.sh email list" {
   run ./setup.sh -c mail email list
-  assert
+  assert_success
 }
 @test "checking setup.sh: setup.sh email update" {
 	initialpass=$(cat ./config/postfix-accounts.cf | grep lorem@impsum.org | awk -F '|' '{print $2}')
@@ -910,11 +910,11 @@ load 'test_helper/bats-assert/load'
     else
       status="1"
     fi
-	assert
+	assert_success
 }
 @test "checking setup.sh: setup.sh email del" {
   run ./setup.sh -c mail email del lorem@impsum.org
-  assert
+  assert_success
   run value=$(cat ./config/postfix-accounts.cf | grep lorem@impsum.org)
   [ -z "$value" ]
 }
@@ -922,12 +922,12 @@ load 'test_helper/bats-assert/load'
 # config
 @test "checking setup.sh: setup.sh config dkim" {
   run ./setup.sh -c mail config dkim
-  assert
+  assert_success
 }
 # TODO: To create a test generate-ssl-certificate must be non interactive
 #@test "checking setup.sh: setup.sh config ssl" {
 #  run ./setup.sh -c mail_ssl config ssl
-#  assert
+#  assert_success
 #}
 
 # debug
@@ -939,13 +939,13 @@ load 'test_helper/bats-assert/load'
 }
 @test "checking setup.sh: setup.sh debug inspect" {
   run ./setup.sh -c mail debug inspect
-  assert
+  assert_success
   [ "${lines[0]}" = "Image: tvial/docker-mailserver:testing" ]
   [ "${lines[1]}" = "Container: mail" ]
 }
 @test "checking setup.sh: setup.sh debug login ls" {
   run ./setup.sh -c mail debug login ls
-  assert
+  assert_success
 }
 
 #
@@ -974,7 +974,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "nc -w 1 0.0.0.0 143 < /tmp/docker-mailserver-test/auth/imap-ldap-auth.txt"
-  assert
+  assert_success
 }
 
 @test "checking dovecot: mail delivery works" {
@@ -993,7 +993,7 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail bash -c "testsaslauthd -u some.user -p secret"
-  assert
+  assert_success
 }
 
 @test "checking saslauthd: ldap smtp authentication" {
@@ -1001,5 +1001,5 @@ load 'test_helper/bats-assert/load'
     skip
   fi
   run docker exec mail /bin/sh -c "nc -w 5 0.0.0.0 25 < /tmp/docker-mailserver-test/auth/sasl-ldap-smtp-auth.txt | grep 'Authentication successful'"
-  assert
+  assert_success
 }