diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java
index e5244fd9b360d43c344c18fed5972d6afbeef30b..28873114f329ccb70349bbda32583a648cb2a362 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java
@@ -63,7 +63,7 @@ public class Table {
     @JoinColumn(name = "tdbid", insertable = false, updatable = false)
     private Database database;
 
-    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE, mappedBy = "table")
+    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.MERGE, mappedBy = "table")
     @OrderBy("ordinalPosition")
     private List<TableColumn> columns;
 
diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationTest.java
index b876f84afefb3b449a427f4b2fa3525c6115f1c2..67f9abc413e93e809b0f9e57625f74e2357d1d33 100644
--- a/fda-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationTest.java
+++ b/fda-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationTest.java
@@ -8,6 +8,9 @@ import at.tuwien.config.MariaDbConfig;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.exception.*;
 import at.tuwien.listener.impl.RabbitMqListenerImpl;
+import at.tuwien.repository.jpa.ContainerRepository;
+import at.tuwien.repository.jpa.DatabaseRepository;
+import at.tuwien.repository.jpa.ImageRepository;
 import at.tuwien.repository.jpa.TableRepository;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotModifiedException;
@@ -55,6 +58,15 @@ public class StoreServiceIntegrationTest extends BaseUnitTest {
     @Autowired
     private TableRepository tableRepository;
 
+    @Autowired
+    private ImageRepository imageRepository;
+
+    @Autowired
+    private ContainerRepository containerRepository;
+
+    @Autowired
+    private DatabaseRepository databaseRepository;
+
     @BeforeAll
     public static void beforeAll() {
         afterAll();
@@ -109,9 +121,12 @@ public class StoreServiceIntegrationTest extends BaseUnitTest {
     @BeforeEach
     @Transactional
     public void beforeEach() {
+        imageRepository.save(IMAGE_1);
+        containerRepository.save(CONTAINER_1);
+        databaseRepository.save(DATABASE_1);
         TABLE_1.setDatabase(DATABASE_1);
-        TABLE_2.setDatabase(DATABASE_2);
         tableRepository.save(TABLE_1);
+        TABLE_2.setDatabase(DATABASE_2);
         tableRepository.save(TABLE_2);
     }
 
diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceTest.java
index 177db87a8e34436ee98889b21937beeaeb1b1916..06c8461e0c18a4eddfc88c37eed3f811923cb7e4 100644
--- a/fda-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceTest.java
+++ b/fda-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceTest.java
@@ -11,10 +11,7 @@ import at.tuwien.config.ReadyConfig;
 import at.tuwien.entities.database.table.columns.TableColumn;
 import at.tuwien.exception.*;
 import at.tuwien.listener.impl.RabbitMqListenerImpl;
-import at.tuwien.repository.jpa.DatabaseRepository;
-import at.tuwien.repository.jpa.ImageRepository;
-import at.tuwien.repository.jpa.TableColumnRepository;
-import at.tuwien.repository.jpa.TableRepository;
+import at.tuwien.repository.jpa.*;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotModifiedException;
 import com.github.dockerjava.api.model.Bind;
@@ -80,12 +77,16 @@ public class TableServiceTest extends BaseUnitTest {
     @Autowired
     private TableRepository tableRepository;
 
+    @Autowired
+    private ContainerRepository containerRepository;
+
     @BeforeEach
     @Transactional
     public void beforeEach() {
         imageRepository.save(IMAGE_1);
         IMAGE_1.setDateFormats(List.of(IMAGE_DATE_1, IMAGE_DATE_2));
         imageRepository.save(IMAGE_1);
+        containerRepository.save(CONTAINER_1);
         databaseRepository.save(DATABASE_1);
         TABLE_1.setDatabase(DATABASE_1);
         tableRepository.save(TABLE_1);