diff --git a/Jenkinsfile b/Jenkinsfile
index d646d1a..9cb326b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
                    sh 'midpoint/download-midpoint'
                    docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache midpoint/midpoint-server")
-                      sh './test.sh'
+                      sh 'env NOCOLOR=true ./test.sh'
                       baseImg.push("$tag")
                    }
                }
diff --git a/midpoint/test.sh b/midpoint/test.sh
index 96071d9..c1cf894 100755
--- a/midpoint/test.sh
+++ b/midpoint/test.sh
@@ -1,22 +1,46 @@
 #!/bin/bash
 
-trap 'exitcode=$? ; echo "Exiting midpoint/test.sh because of an error ($exitcode) occurred" ; exit $exitcode' ERR
+trap 'exitcode=$? ; error "Exiting midpoint/test.sh because of an error ($exitcode) occurred" ; exit $exitcode' ERR
 
 cd "$(dirname "$0")"
 . ../test/common.sh
 
-yellow "*** Composing midPoint..."
+heading "Composing midPoint..."
 docker-compose up --no-start
-green "==> midPoint composed OK"
+ok "midPoint composed OK"
 echo
-yellow "*** Starting midPoint..."
+
+heading "Starting midPoint..."
 docker-compose start
-green "==> midPoint started OK"
+ok "midPoint started OK"
+echo
+
+heading "Test 010: Waiting for midPoint to start..."
+test/t010-wait-for-start.sh
+ok "midPoint started"
 echo
-yellow "*** Waiting for midPoint to start..."
-test/wait-for-start.sh
-green "==> midPoint started"
+
+heading "Test 100: Checking health via HTTP..."
+test/t100-check-health.sh
+ok "Health check passed"
+echo
+
+heading "Test 110: Getting user 'administrator'..."
+test/t110-get-administrator.sh
+ok "User 'administrator' retrieved and checked"
 echo
-yellow "*** Checking health via HTTP..."
-(set -o pipefail ; curl -k -f https://localhost:8443/midpoint/actuator/health | tr -d '[:space:]' | grep -q "\"status\":\"UP\"")
-green "==> Health is OK"
+
+heading "Test 120: Adding and getting a user..."
+test/t120-add-get-user.sh
+ok "OK"
+echo
+
+heading "Test 200: Stop/start cycle..."
+test/t200-stop-start.sh
+ok "OK"
+echo
+
+#heading "Test 300: Checking repository preservation across compose down/up..."
+#test/t300-repository-preservation.sh
+#ok "OK"
+#echo
diff --git a/midpoint/test/wait-for-start.sh b/midpoint/test/t010-wait-for-start.sh
similarity index 100%
rename from midpoint/test/wait-for-start.sh
rename to midpoint/test/t010-wait-for-start.sh
diff --git a/midpoint/test/t100-check-health.sh b/midpoint/test/t100-check-health.sh
new file mode 100755
index 0000000..c6e864c
--- /dev/null
+++ b/midpoint/test/t100-check-health.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+set -o pipefail ; curl -k -f https://localhost:8443/midpoint/actuator/health | tr -d '[:space:]' | grep -q "\"status\":\"UP\""
diff --git a/midpoint/test/t110-get-administrator.sh b/midpoint/test/t110-get-administrator.sh
new file mode 100755
index 0000000..43b8af9
--- /dev/null
+++ b/midpoint/test/t110-get-administrator.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X GET "https://localhost:8443/midpoint/ws/rest/users/00000000-0000-0000-0000-000000000002" >/tmp/admin.xml
+grep -q "<name>administrator</name>" </tmp/admin.xml || (echo "User 'administrator' was not found or not retrieved correctly" ; exit 1)
+rm /tmp/admin.xml
diff --git a/midpoint/test/t120-add-get-user.sh b/midpoint/test/t120-add-get-user.sh
new file mode 100755
index 0000000..2ba04ef
--- /dev/null
+++ b/midpoint/test/t120-add-get-user.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+trap 'exitcode=$? ; error "Exiting because of an error ($exitcode) occurred" ; exit $exitcode' ERR
+. ../test/common.sh
+
+echo "Adding user 'test120'..."
+curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST "https://localhost:8443/midpoint/ws/rest/users" -d @- << EOF
+<user>
+  <name>test120</name>
+</user>
+EOF
+echo "OK"
+
+echo "Searching for user 'test120'..."
+curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST "https://localhost:8443/midpoint/ws/rest/users/search" -d @- << EOF >/tmp/test120.xml
+<q:query xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">
+    <q:filter>
+        <q:equal>
+            <q:path>name</q:path>
+            <q:value>test120</q:value>
+        </q:equal>
+    </q:filter>
+</q:query>
+EOF
+echo "OK"
+
+grep -q "<name>test120</name>" </tmp/test120.xml || (error "Retrieved XML is not as expected" ; exit 1)
+rm /tmp/test120.xml
diff --git a/midpoint/test/t200-stop-start.sh b/midpoint/test/t200-stop-start.sh
new file mode 100755
index 0000000..63391bb
--- /dev/null
+++ b/midpoint/test/t200-stop-start.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+trap 'exitcode=$? ; error "Exiting because of an error ($exitcode) occurred" ; exit $exitcode' ERR
+. ../test/common.sh
+
+echo "Stopping containers..."
+docker-compose stop
+echo "OK"
+echo
+echo "Starting containers..."
+docker-compose start
+test/t010-wait-for-start.sh
+echo "OK"
+
+# Eventually remove this (after this problem is fixed)
+#echo "Checking for 'address already in use' message"
+#(docker logs midpoint_midpoint-server_1 2>&1 | grep "ERROR Shibboleth.Listener : failed socket call (bind), result (98): Address already in use") && yellow "=== Address already in use! ===" && docker-compose down && docker-compose up --no-start && docker-compose start
+
+echo
+echo "Getting user 'administrator'..."
+test/t110-get-administrator.sh
diff --git a/midpoint/test/t300-repository-preservation.sh b/midpoint/test/t300-repository-preservation.sh
new file mode 100755
index 0000000..92403d8
--- /dev/null
+++ b/midpoint/test/t300-repository-preservation.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+USER=test300
+trap 'exitcode=$? ; error "Exiting because of an error ($exitcode) occurred" ; exit $exitcode' ERR
+. ../test/common.sh
+
+echo "Adding user '${USER}'..."
+curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST "https://localhost:8443/midpoint/ws/rest/users" -d @- << EOF
+<user>
+  <name>${USER}</name>
+</user>
+EOF
+echo "OK"
+
+echo "Searching for user '${USER}'..."
+curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST "https://localhost:8443/midpoint/ws/rest/users/search" -d @- << EOF >/tmp/${USER}.xml
+<q:query xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">
+    <q:filter>
+        <q:equal>
+            <q:path>name</q:path>
+            <q:value>${USER}</q:value>
+        </q:equal>
+    </q:filter>
+</q:query>
+EOF
+echo "OK"
+
+grep -q "<name>${USER}</name>" </tmp/${USER}.xml || (error "User ${USER} was not found" ; exit 1)
+rm /tmp/${USER}.xml
+
+echo "Bringing the containers down"
+docker-compose down
+
+echo "Re-creating the containers"
+docker-compose up --no-start
+docker-compose start
+test/t010-wait-for-start.sh
+
+echo "Searching for user '${USER}' again..."
+curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X POST "https://localhost:8443/midpoint/ws/rest/users/search" -d @- << EOF >/tmp/${USER}.xml
+<q:query xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">
+    <q:filter>
+        <q:equal>
+            <q:path>name</q:path>
+            <q:value>${USER}</q:value>
+        </q:equal>
+    </q:filter>
+</q:query>
+EOF
+echo "OK"
+
+grep -q "<name>${USER}</name>" </tmp/${USER}.xml || (error "User ${USER} was not found (after restart) -- but continuing" ; exit 0)
+rm /tmp/${USER}.xml
diff --git a/test.sh b/test.sh
index 3c34e42..f42c8b9 100755
--- a/test.sh
+++ b/test.sh
@@ -2,9 +2,13 @@
 
 . test/common.sh
 
-trap 'exitcode=$? ; red "Exiting test.sh because of an error ($exitcode) occurred" ; exit $exitcode' ERR
-echo "**************************************************************************************"
-echo "***                            Testing midPoint image                              ***"
-echo "**************************************************************************************"
+trap 'exitcode=$? ; error "Exiting test.sh because of an error ($exitcode) occurred" ; exit $exitcode' ERR
+yellow "**************************************************************************************"
+yellow "***                            Testing midPoint image                              ***"
+yellow "**************************************************************************************"
 echo
 midpoint/test.sh
+echo
+lgreen "**************************************************************************************"
+lgreen "***                               All tests passed                                 ***"
+lgreen "**************************************************************************************"
diff --git a/test/common.sh b/test/common.sh
index 68c5327..89c6130 100755
--- a/test/common.sh
+++ b/test/common.sh
@@ -1,18 +1,62 @@
 #!/bin/bash
 
-RED='\033[1;31m'
+BOLD='\033[1m'
+UNDERLINE='\033[4m'
+LRED='\033[1;31m'
+LGREEN='\033[1;32m'
+LCYAN='\033[1;36m'
 YELLOW='\033[1;33m'
-GREEN='\033[1;32m'
 NC='\033[0m'
 
-function red () {
-  echo -e ${RED}$*${NC}
+function lred () {
+  if [ -z "$NOCOLOR" ]; then
+    echo -e "${LRED}$*${NC}"
+  else
+    echo "$*"
+  fi
+}
+
+function lgreen () {
+  if [ -z "$NOCOLOR" ]; then
+    echo -e "${LGREEN}$*${NC}"
+  else
+    echo "$*"
+  fi
+}
+
+function lcyan () {
+  if [ -z "$NOCOLOR" ]; then
+    echo -e "${LCYAN}$*${NC}"
+  else
+    echo "$*"
+  fi
 }
 
 function yellow () {
-  echo -e ${YELLOW}$*${NC}
+  if [ -z "$NOCOLOR" ]; then
+    echo -e "${YELLOW}$*${NC}"
+  else
+    echo "$*"
+  fi
+}
+
+function boldUnderline () {
+  if [ -z "$NOCOLOR" ]; then
+    echo -e "${BOLD}${UNDERLINE}$*${NC}"
+  else
+    echo "$*"
+  fi
 }
 
-function green () {
-  echo -e ${GREEN}$*${NC}
+function heading () {
+  lcyan "=== $*"
 }
+
+function ok () {
+  lgreen "==> $*"
+}
+
+function error () {
+  lred "$*"
+}
+