diff --git a/Dockerfile b/Dockerfile
index c2a03a91..70e96f1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -182,4 +182,5 @@ EXPOSE 25 587 143 993 110 995 4190
 
 CMD supervisord -c /etc/supervisor/supervisord.conf
 
-ADD target/filebeat.yml.tmpl /etc/filebeat/filebeat.yml.tmpl
\ No newline at end of file
+ADD target/filebeat.yml.tmpl /etc/filebeat/filebeat.yml.tmpl
+
diff --git a/Makefile b/Makefile
index 33f43da1..3b9a57fd 100644
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,6 @@ run:
 		-e POSTMASTER_ADDRESS=postmaster@localhost.localdomain \
 		-e DMS_DEBUG=0 \
 		-h mail.my-domain.com -t $(NAME)
-	# Wait for containers to fully start
 	sleep 15
 	docker run -d --name mail_lmtp_ip \
 		-v "`pwd`/test/config":/tmp/docker-mailserver \
@@ -188,7 +187,7 @@ fixtures:
 
 	docker exec mail_override_hostname /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-user1.txt"
 	# Wait for mails to be analyzed
-	sleep 40
+	sleep 20
 
 tests:
 	# Start tests
diff --git a/target/fail2ban-wrapper.sh b/target/fail2ban-wrapper.sh
index f866a476..9129af88 100644
--- a/target/fail2ban-wrapper.sh
+++ b/target/fail2ban-wrapper.sh
@@ -30,4 +30,5 @@ sleep 5
 # wait until fail2ban is dead (triggered by trap)
 while kill -0 "`cat /var/run/fail2ban/fail2ban.pid`"; do
   sleep 5
-done
\ No newline at end of file
+done
+
diff --git a/target/postfix-wrapper.sh b/target/postfix-wrapper.sh
index 35caf190..d93ca8ce 100644
--- a/target/postfix-wrapper.sh
+++ b/target/postfix-wrapper.sh
@@ -30,4 +30,5 @@ sleep 5
 # wait until postfix is dead (triggered by trap)
 while kill -0 "`cat /var/spool/postfix/pid/master.pid`"; do
   sleep 5
-done
\ No newline at end of file
+done
+
diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index d3976b12..f17d5c5d 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -1158,12 +1158,10 @@ function _start_daemons_dovecot() {
 	if [ "$ENABLE_POP3" = 1 ]; then
 		notify 'task' 'Starting pop3 services' 'n'
 		mv /etc/dovecot/protocols.d/pop3d.protocol.disab /etc/dovecot/protocols.d/pop3d.protocol
-		# /usr/sbin/dovecot reload
 	fi
 
 	if [ -f /tmp/docker-mailserver/dovecot.cf ]; then
 		cp /tmp/docker-mailserver/dovecot.cf /etc/dovecot/local.conf
-		# /usr/sbin/dovecot reload
 	fi
 
     supervisorctl start dovecot
diff --git a/target/supervisor/saslauth.conf b/target/supervisor/saslauth.conf
index 43e1ab84..264fff93 100644
--- a/target/supervisor/saslauth.conf
+++ b/target/supervisor/saslauth.conf
@@ -41,4 +41,5 @@ autorestart=true
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 stderr_logfile=/var/log/supervisor/%(program_name)s.log
 command=/usr/sbin/saslauthd -d -a shadow -O %(ENV_SASLAUTHD_MECH_OPTIONS)s
-pidfile=/var/run/saslauthd/saslauthd.pid
\ No newline at end of file
+pidfile=/var/run/saslauthd/saslauthd.pid
+
diff --git a/target/supervisor/supervisor-app.conf b/target/supervisor/supervisor-app.conf
index 14403add..4b196ca1 100644
--- a/target/supervisor/supervisor-app.conf
+++ b/target/supervisor/supervisor-app.conf
@@ -112,4 +112,5 @@ autostart=false
 autorestart=true
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 stderr_logfile=/var/log/supervisor/%(program_name)s.log
-command=/usr/local/bin/postfix-wrapper.sh
\ No newline at end of file
+command=/usr/local/bin/postfix-wrapper.sh
+
diff --git a/test/tests.bats b/test/tests.bats
index 660532f8..204bcc3b 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -1232,4 +1232,5 @@ load 'test_helper/bats-assert/load'
 @test "checking restart of process: saslauthd (saslauthd server enabled)" {
   run docker exec mail_with_ldap /bin/bash -c "pkill saslauthd && sleep 10 && ps aux --forest | grep -v grep | grep '/usr/sbin/saslauthd'"
   assert_success
-}
\ No newline at end of file
+}
+