diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
index dc8ad2cb64fbff87d9588ae9ee2f561c34b919f2..62298e08a101fd4139bded21b3c157e35f7b31dc 100644
--- a/fda-container-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
+++ b/fda-container-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
@@ -185,6 +185,7 @@ public abstract class BaseUnitTest {
             .id(CONTAINER_1_ID)
             .name(CONTAINER_1_NAME)
             .internalName(CONTAINER_1_INTERNALNAME)
+            .imageId(IMAGE_1_ID)
             .image(IMAGE_1)
             .hash(CONTAINER_1_HASH)
             .ipAddress(CONTAINER_1_IP)
@@ -203,6 +204,7 @@ public abstract class BaseUnitTest {
             .id(CONTAINER_2_ID)
             .name(CONTAINER_2_NAME)
             .internalName(CONTAINER_2_INTERNALNAME)
+            .imageId(IMAGE_1_ID)
             .image(IMAGE_1)
             .hash(CONTAINER_2_HASH)
             .ipAddress(CONTAINER_2_IP)
@@ -221,6 +223,7 @@ public abstract class BaseUnitTest {
             .id(CONTAINER_3_ID)
             .name(CONTAINER_3_NAME)
             .internalName(CONTAINER_3_INTERNALNAME)
+            .imageId(IMAGE_1_ID)
             .image(IMAGE_1)
             .hash(CONTAINER_3_HASH)
             .ipAddress(CONTAINER_3_IP)
diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
index 92e95ff692557c9832ecf3983cda4c0aa9019ed8..f033c9dc8b7f797b48095cefebf727a1fac1b877 100644
--- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
+++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
@@ -166,6 +166,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -234,6 +235,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -268,6 +270,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -303,6 +306,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -338,6 +342,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -373,6 +378,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -382,6 +388,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_2_ID)
                 .name(CONTAINER_2_NAME)
                 .internalName(CONTAINER_2_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_2_HASH)
                 .ipAddress(CONTAINER_2_IP)
@@ -417,6 +424,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -461,6 +469,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -498,6 +507,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -535,6 +545,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -570,6 +581,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -608,6 +620,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -644,6 +657,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -680,6 +694,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)
@@ -728,6 +743,7 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
                 .id(CONTAINER_1_ID)
                 .name(CONTAINER_1_NAME)
                 .internalName(CONTAINER_1_INTERNALNAME)
+                .imageId(IMAGE_1_ID)
                 .image(IMAGE_1)
                 .hash(CONTAINER_1_HASH)
                 .ipAddress(CONTAINER_1_IP)