diff --git a/config b/config
index 4d0a28a..f567c24 100644
--- a/config
+++ b/config
@@ -4,7 +4,7 @@ export POSTGRES_IMAGE_VERSION=${POSTGRES_IMAGE_VERSION:="9.5"}
 export POSTGRES_ROOT=/var/lib/dokku/services/postgres
 
 export PLUGIN_COMMAND_PREFIX="postgres"
-export PLUGIN_DATA_ROOT=$POSTGRES_ROOT
+export PLUGIN_DATA_ROOT=${PLUGIN_DATA_ROOT:="$POSTGRES_ROOT"}
 export PLUGIN_DATASTORE_PORTS=(5432)
 export PLUGIN_DEFAULT_ALIAS="DATABASE"
 export PLUGIN_IMAGE=$POSTGRES_IMAGE
diff --git a/tests/bin/docker b/tests/bin/docker
index 0c7a378..87eeee5 100755
--- a/tests/bin/docker
+++ b/tests/bin/docker
@@ -20,8 +20,17 @@ case "$1" in
       echo "1479bbd60ade8a92617d2aeb4935bd3ff3179bd0fd71c22c3102c421f4bc221f"
       exit 0
     else
-      echo "CONTAINER ID        IMAGE                      COMMAND                CREATED             STATUS              PORTS               NAMES"
-      echo "testid              redis:3.0.3                \"/entrypoint.sh redi   5 minutes ago       Up 5 minutes                   6379/tcp            dokku.redis.l"
+      echo "CONTAINER ID        IMAGE                      COMMAND                CREATED             STATUS                         PORTS               NAMES"
+      echo "4eeaae231d5e        elasticsearch:1.7.1        \"/docker-entrypoint.   11 seconds ago       Up 10 seconds       9200/tcp, 9300/tcp               dokku.elasticsearch.l"
+      echo "ef27fec191ba        memcached:1.4.24           \"/entrypoint.sh memc   11 seconds ago       Up 10 seconds       11211/tcp                        dokku.memcached.l"
+      echo "94df08fe5550        mariadb:10.0.21            \"/docker-entrypoint.   11 seconds ago       Up 10 seconds       3306/tcp                         dokku.mariadb.l"
+      echo "ef27fec191ba        memcached:1.4.24           \"/entrypoint.sh memc   11 seconds ago       Up 10 seconds       11211/tcp                        dokku.memcached.l"
+      echo "c0f74fc90377        mongo:3.1.6                \"/entrypoint.sh mong   11 seconds ago       Up 10 seconds       27017/tcp                        dokku.mongo.l"
+      echo "0f33b1c86da9        mysql:5.7                  \"/entrypoint.sh mysq   11 seconds ago       Up 10 seconds       3306/tcp                         dokku.mysql.l"
+      echo "7f899b723c08        postgres:9.5               \"/docker-entrypoint.   11 seconds ago       Up 10 seconds       5432/tcp                         dokku.postgres.l"
+      echo "5e50a462661e        rabbitmq:3.5.4-management  \"/docker-entrypoint.   11 seconds ago       Up 10 seconds       5672/tcp, 15672/tcp              dokku.rabbitmq.l"
+      echo "c39ca00fa3c6        redis:3.0.3                \"/entrypoint.sh redi   11 seconds ago       Up 10 seconds       6379/tcp                         dokku.redis.l"
+      echo "dc98c2939a80        rethinkdb:2.1.1            \"rethinkdb --bind al   11 seconds ago       Up 10 seconds       8080/tcp, 28015/tcp, 29015/tcp   dokku.rethinkdb.l"
     fi
     ;;
   exec)
@@ -38,7 +47,16 @@ case "$1" in
     ;;
   images)
     echo "REPOSITORY                TAG                 IMAGE ID            CREATED             VIRTUAL SIZE"
+    echo "elasticsearch             1.7.1               89ed89918502        9 days ago          522.1 MB"
+    echo "mariadb                   10.0.21             f2485761e714        11 days ago         302.2 MB"
+    echo "memcached                 1.4.24              8a05b51f8876        13 days ago         132.4 MB"
+    echo "mongo                     3.1.6               7e67358fb571        13 days ago         291.1 MB"
+    echo "mysql                     5.7                 57d56ac47bed        13 days ago         321.3 MB"
+    echo "postgres                  9.5                 6412eb70175e        11 days ago         265.7 MB"
+    echo "rabbitmq                  3.5.4-management    327b803301e9        13 days ago         143.5 MB"
     echo "redis                     3.0.3               9216d5a4eec8        13 days ago         109.3 MB"
+    echo "rethinkdb                 2.1.1               f27010a550ec        13 days ago         196.3 MB"
+    echo "svendowideit/ambassador   latest              0d2200edc53e        21 months ago       7.241 MB"
     ;;
   pull)
     exit 0