diff --git a/demo/complex/tests/main.bats b/demo/complex/tests/main.bats
index 916cb0b..ec21f99 100755
--- a/demo/complex/tests/main.bats
+++ b/demo/complex/tests/main.bats
@@ -73,5 +73,5 @@ load ../../../library
 }
 
 @test "999 Clean up" {
-#    docker-compose down -v
+    docker-compose down -v
 }
diff --git a/demo/shibboleth/tests/main.bats b/demo/shibboleth/tests/main.bats
index 4d98519..dfdd6c2 100755
--- a/demo/shibboleth/tests/main.bats
+++ b/demo/shibboleth/tests/main.bats
@@ -28,34 +28,31 @@ load ../../../library
     [ "$status" -eq 302 ]
 }
 
-@test "041 Check Shibboleth redirection  (/midpoint/)" {
+@test "041 Check Shibboleth redirection (/midpoint/)" {
     status="$(curl -k --write-out %{http_code} --silent --output /dev/null https://localhost:8443/midpoint/)"
     [ "$status" -eq 302 ]
 }
 
-@test "042 Check Shibboleth redirection  (/midpoint/login)" {
+@test "042 Check Shibboleth redirection (/midpoint/login)" {
     status="$(curl -k --write-out %{http_code} --silent --output /dev/null https://localhost:8443/midpoint/login)"
     [ "$status" -eq 302 ]
 }
 
-@test "043 Check Shibboleth redirection  (/midpoint/something)" {
+@test "043 Check Shibboleth redirection (/midpoint/something)" {
     status="$(curl -k --write-out %{http_code} --silent --output /dev/null https://localhost:8443/midpoint/something)"
     [ "$status" -eq 302 ]
 }
 
-@test "044 Check SOAP without Shibboleth redirection  (/midpoint/ws/)" {
+@test "044 Check SOAP without Shibboleth redirection (/midpoint/ws/)" {
     status="$(curl -k --write-out %{http_code} --silent --output /dev/null https://localhost:8443/midpoint/ws/)"
     [ "$status" -eq 200 ]
 }
 
-@test "045 Check SOAP without Shibboleth redirection  (/midpoint/model/)" {
+@test "045 Check SOAP without Shibboleth redirection (/midpoint/model/)" {
     status="$(curl -k --write-out %{http_code} --silent --output /dev/null https://localhost:8443/midpoint/model/)"
     [ "$status" -eq 200 ]
 }
 
-
-# TODO check that e.g. accessing some URLs results in shibboleth redirection (check login page, some REST calls etc)
-
 @test "999 Clean up" {
     cd ../simple ; docker-compose down -v ; true
     docker-compose down -v