diff --git a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
index a45ead5f7bdbced79d6d43b5a613c9c23db754ca..1c94de462458c39f2b6b94b817cb1380573449eb 100644
--- a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
@@ -25,6 +25,8 @@ import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.foreign.Creat
 import at.ac.tuwien.ifs.dbrepo.core.api.database.table.constraints.primary.PrimaryKeyDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.grafana.CreateDashboardDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.grafana.CreateDashboardResponseDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.identifier.IdentifierBriefDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.identifier.IdentifierDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.identifier.IdentifierFunderTypeDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.keycloak.*;
 import at.ac.tuwien.ifs.dbrepo.core.api.maintenance.BannerMessageCreateDto;
@@ -167,6 +169,24 @@ public class BaseTest {
 
     public static final String KEYCLOAK_IMAGE = "quay.io/keycloak/keycloak:26.0.4";
 
+    public static final Container CONTAINER_1;
+    public static final ContainerDto CONTAINER_1_DTO;
+    public static final ContainerBriefDto CONTAINER_1_BRIEF_DTO;
+    public static final Container CONTAINER_2;
+    public static final ContainerDto CONTAINER_2_DTO;
+    public static final ContainerBriefDto CONTAINER_2_BRIEF_DTO;
+    public static final Database DATABASE_1;
+    public static final DatabaseDto DATABASE_1_DTO;
+    public static final DatabaseBriefDto DATABASE_1_BRIEF_DTO;
+    public static final Database DATABASE_2;
+    public static final DatabaseDto DATABASE_2_DTO;
+    public static final DatabaseBriefDto DATABASE_2_BRIEF_DTO;
+    public static final Database DATABASE_3;
+    public static final DatabaseDto DATABASE_3_DTO;
+    public static final DatabaseBriefDto DATABASE_3_BRIEF_DTO;
+    public static final Database DATABASE_4;
+    public static final DatabaseDto DATABASE_4_DTO;
+    public static final DatabaseBriefDto DATABASE_4_BRIEF_DTO;
     public static final QueryDto QUERY_1_DTO;
     public static final QueryDto QUERY_2_DTO;
     public static final QueryDto QUERY_3_DTO;
@@ -203,16 +223,48 @@ public class BaseTest {
     public static final User USER_5;
     public static final UserDto USER_5_DTO;
     public static final UserBriefDto USER_5_BRIEF_DTO;
-//    public static final Identifier IDENTIFIER_1;
-//    public static final Identifier IDENTIFIER_2;
-//    public static final Identifier IDENTIFIER_3;
-//    public static final Identifier IDENTIFIER_4;
-//    public static final Identifier IDENTIFIER_5;
-//    public static final Identifier IDENTIFIER_6;
-//    public static final Identifier IDENTIFIER_7;
+    public static final Identifier IDENTIFIER_1;
+    public static final IdentifierDto IDENTIFIER_1_DTO;
+    public static final IdentifierBriefDto IDENTIFIER_1_BRIEF_DTO;
+    public static final Identifier IDENTIFIER_2;
+    public static final IdentifierDto IDENTIFIER_2_DTO;
+    public static final IdentifierBriefDto IDENTIFIER_2_BRIEF_DTO;
+    public static final Identifier IDENTIFIER_3;
+    public static final IdentifierDto IDENTIFIER_3_DTO;
+    public static final IdentifierBriefDto IDENTIFIER_3_BRIEF_DTO;
+    public static final Identifier IDENTIFIER_4;
+    public static final IdentifierDto IDENTIFIER_4_DTO;
+    public static final IdentifierBriefDto IDENTIFIER_4_BRIEF_DTO;
+    public static final Identifier IDENTIFIER_5;
+    public static final IdentifierDto IDENTIFIER_5_DTO;
+    public static final IdentifierBriefDto IDENTIFIER_5_BRIEF_DTO;
+    public static final Identifier IDENTIFIER_6;
+    public static final IdentifierDto IDENTIFIER_6_DTO;
+    public static final IdentifierBriefDto IDENTIFIER_6_BRIEF_DTO;
+    public static final Identifier IDENTIFIER_7;
+    public static final IdentifierDto IDENTIFIER_7_DTO;
+    public static final IdentifierBriefDto IDENTIFIER_7_BRIEF_DTO;
 
     static {
         try {
+            CONTAINER_1 = objectMapper().readValue(new File(resourcesPath + "/container-1.json"), Container.class);
+            CONTAINER_1_DTO = metadataMapper.containerToContainerDto(CONTAINER_1);
+            CONTAINER_1_BRIEF_DTO = metadataMapper.containerToContainerBriefDto(CONTAINER_1);
+            CONTAINER_2 = objectMapper().readValue(new File(resourcesPath + "/container-1.json"), Container.class);
+            CONTAINER_2_DTO = metadataMapper.containerToContainerDto(CONTAINER_2);
+            CONTAINER_2_BRIEF_DTO = metadataMapper.containerToContainerBriefDto(CONTAINER_2);
+            DATABASE_1 = objectMapper().readValue(new File(resourcesPath + "/database-1.json"), Database.class);
+            DATABASE_1_DTO = metadataMapper.databaseToDatabaseDto(DATABASE_1);
+            DATABASE_1_BRIEF_DTO = metadataMapper.databaseToDatabaseBriefDto(DATABASE_1);
+            DATABASE_2 = objectMapper().readValue(new File(resourcesPath + "/database-2.json"), Database.class);
+            DATABASE_2_DTO = metadataMapper.databaseToDatabaseDto(DATABASE_2);
+            DATABASE_2_BRIEF_DTO = metadataMapper.databaseToDatabaseBriefDto(DATABASE_2);
+            DATABASE_3 = objectMapper().readValue(new File(resourcesPath + "/database-3.json"), Database.class);
+            DATABASE_3_DTO = metadataMapper.databaseToDatabaseDto(DATABASE_3);
+            DATABASE_3_BRIEF_DTO = metadataMapper.databaseToDatabaseBriefDto(DATABASE_3);
+            DATABASE_4 = objectMapper().readValue(new File(resourcesPath + "/database-4.json"), Database.class);
+            DATABASE_4_DTO = metadataMapper.databaseToDatabaseDto(DATABASE_4);
+            DATABASE_4_BRIEF_DTO = metadataMapper.databaseToDatabaseBriefDto(DATABASE_4);
             QUERY_1_DTO = objectMapper().readValue(new File(resourcesPath + "/query-1.json"), QueryDto.class);
             QUERY_2_DTO = objectMapper().readValue(new File(resourcesPath + "/query-2.json"), QueryDto.class);
             QUERY_3_DTO = objectMapper().readValue(new File(resourcesPath + "/query-3.json"), QueryDto.class);
@@ -249,27 +301,27 @@ public class BaseTest {
             USER_5 = objectMapper().readValue(new File(resourcesPath + "/user-5.json"), User.class);
             USER_5_DTO = metadataMapper.userToUserDto(USER_1);
             USER_5_BRIEF_DTO = metadataMapper.userToUserBriefDto(USER_1);
-//            IDENTIFIER_1 = objectMapper().readValue(new File(resourcesPath + "/identifier-1.json"), Identifier.class);
-//            IDENTIFIER_1_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_1);
-//            IDENTIFIER_1_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_1);
-//            IDENTIFIER_2 = objectMapper().readValue(new File(resourcesPath + "/identifier-2.json"), Identifier.class);
-//            IDENTIFIER_2_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_2);
-//            IDENTIFIER_2_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_2);
-//            IDENTIFIER_3 = objectMapper().readValue(new File(resourcesPath + "/identifier-3.json"), Identifier.class);
-//            IDENTIFIER_3_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_3);
-//            IDENTIFIER_3_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_3);
-//            IDENTIFIER_4 = objectMapper().readValue(new File(resourcesPath + "/identifier-4.json"), Identifier.class);
-//            IDENTIFIER_4_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_4);
-//            IDENTIFIER_4_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_4);
-//            IDENTIFIER_5 = objectMapper().readValue(new File(resourcesPath + "/identifier-5.json"), Identifier.class);
-//            IDENTIFIER_5_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_5);
-//            IDENTIFIER_5_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_5);
-//            IDENTIFIER_6 = objectMapper().readValue(new File(resourcesPath + "/identifier-6.json"), Identifier.class);
-//            IDENTIFIER_6_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_6);
-//            IDENTIFIER_6_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_6);
-//            IDENTIFIER_7 = objectMapper().readValue(new File(resourcesPath + "/identifier-7.json"), Identifier.class);
-//            IDENTIFIER_7_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_7);
-//            IDENTIFIER_7_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_7);
+            IDENTIFIER_1 = objectMapper().readValue(new File(resourcesPath + "/identifier-1.json"), Identifier.class);
+            IDENTIFIER_1_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_1);
+            IDENTIFIER_1_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_1);
+            IDENTIFIER_2 = objectMapper().readValue(new File(resourcesPath + "/identifier-2.json"), Identifier.class);
+            IDENTIFIER_2_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_2);
+            IDENTIFIER_2_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_2);
+            IDENTIFIER_3 = objectMapper().readValue(new File(resourcesPath + "/identifier-3.json"), Identifier.class);
+            IDENTIFIER_3_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_3);
+            IDENTIFIER_3_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_3);
+            IDENTIFIER_4 = objectMapper().readValue(new File(resourcesPath + "/identifier-4.json"), Identifier.class);
+            IDENTIFIER_4_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_4);
+            IDENTIFIER_4_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_4);
+            IDENTIFIER_5 = objectMapper().readValue(new File(resourcesPath + "/identifier-5.json"), Identifier.class);
+            IDENTIFIER_5_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_5);
+            IDENTIFIER_5_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_5);
+            IDENTIFIER_6 = objectMapper().readValue(new File(resourcesPath + "/identifier-6.json"), Identifier.class);
+            IDENTIFIER_6_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_6);
+            IDENTIFIER_6_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_6);
+            IDENTIFIER_7 = objectMapper().readValue(new File(resourcesPath + "/identifier-7.json"), Identifier.class);
+            IDENTIFIER_7_DTO = metadataMapper.identifierToIdentifierDto(IDENTIFIER_7);
+            IDENTIFIER_7_BRIEF_DTO = metadataMapper.identifierToIdentifierBriefDto(IDENTIFIER_7);
         } catch (IOException e) {
             throw new RuntimeException("Failed to initialize core test library", e);
         }
@@ -534,273 +586,6 @@ public class BaseTest {
     public static final Principal USER_5_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_5_DETAILS,
             USER_5_PASSWORD, USER_5_DETAILS.getAuthorities());
 
-    public static final UUID IMAGE_1_ID = UUID.fromString("e5449ade-acc1-4ba4-8858-e3496cdecd9c");
-    public static final String IMAGE_1_REGISTRY = "docker.io";
-    public static final String IMAGE_1_NAME = "mariadb";
-    public static final String IMAGE_1_VERSION = "11.1.3";
-    public static final String IMAGE_1_DIALECT = "org.hibernate.dialect.MariaDBDialect";
-    public static final String IMAGE_1_DRIVER = "org.mariadb.jdbc.Driver";
-    public static final String IMAGE_1_JDBC = "mariadb";
-    public static final Integer IMAGE_1_PORT = 3306;
-    public static final Boolean IMAGE_1_IS_DEFAULT = true;
-
-    public static final ImageCreateDto IMAGE_1_CREATE_DTO = ImageCreateDto.builder()
-            .registry(IMAGE_1_REGISTRY)
-            .name(IMAGE_1_NAME)
-            .version(IMAGE_1_VERSION)
-            .dialect(IMAGE_1_DIALECT)
-            .jdbcMethod(IMAGE_1_JDBC)
-            .driverClass(IMAGE_1_DRIVER)
-            .defaultPort(IMAGE_1_PORT)
-            .build();
-
-    public static final ImageChangeDto IMAGE_1_CHANGE_DTO = ImageChangeDto.builder()
-            .registry(IMAGE_1_REGISTRY)
-            .dialect(IMAGE_1_DIALECT)
-            .jdbcMethod(IMAGE_1_JDBC)
-            .driverClass(IMAGE_1_DRIVER)
-            .defaultPort(IMAGE_1_PORT)
-            .build();
-
-    public static final ContainerImage IMAGE_1 = ContainerImage.builder()
-            .id(IMAGE_1_ID)
-            .name(IMAGE_1_NAME)
-            .registry(IMAGE_1_REGISTRY)
-            .version(IMAGE_1_VERSION)
-            .dialect(IMAGE_1_DIALECT)
-            .jdbcMethod(IMAGE_1_JDBC)
-            .driverClass(IMAGE_1_DRIVER)
-            .defaultPort(IMAGE_1_PORT)
-            .isDefault(IMAGE_1_IS_DEFAULT)
-            .operators(new LinkedList<>()) /* IMAGE_1_OPERATORS */
-            .build();
-
-    public static final ImageDto IMAGE_1_DTO = ImageDto.builder()
-            .id(IMAGE_1_ID)
-            .name(IMAGE_1_NAME)
-            .version(IMAGE_1_VERSION)
-            .isDefault(IMAGE_1_IS_DEFAULT)
-            .jdbcMethod(IMAGE_1_JDBC)
-            .operators(null) /* IMAGE_1_OPERATORS_DTO */
-            .build();
-
-    public static final ImageBriefDto IMAGE_1_BRIEF_DTO = ImageBriefDto.builder()
-            .id(IMAGE_1_ID)
-            .name(IMAGE_1_NAME)
-            .version(IMAGE_1_VERSION)
-            .isDefault(IMAGE_1_IS_DEFAULT)
-            .build();
-
-    public static final UUID IMAGE_1_OPERATORS_1_ID = UUID.fromString("42a56348-38bd-4aba-b0f2-ac813d5d2da1");
-    public static final String IMAGE_1_OPERATORS_1_DISPLAY_NAME = "XOR";
-    public static final String IMAGE_1_OPERATORS_1_VALUE = "XOR";
-    public static final String IMAGE_1_OPERATORS_1_DOCUMENTATION = "https://mariadb.com/kb/en/xor/";
-
-    public static final UUID IMAGE_1_OPERATORS_2_ID = UUID.fromString("42a56348-38bd-4aba-b0f2-ac813d5d2da2");
-    public static final String IMAGE_1_OPERATORS_2_DISPLAY_NAME = "=";
-    public static final String IMAGE_1_OPERATORS_2_VALUE = "=";
-    public static final String IMAGE_1_OPERATORS_2_DOCUMENTATION = "https://mariadb.com/kb/en/equal/";
-
-    public static final List<Operator> IMAGE_1_OPERATORS = new LinkedList<>(List.of(
-            Operator.builder()
-                    .id(IMAGE_1_OPERATORS_1_ID)
-                    .image(IMAGE_1)
-                    .displayName(IMAGE_1_OPERATORS_1_DISPLAY_NAME)
-                    .value(IMAGE_1_OPERATORS_1_VALUE)
-                    .documentation(IMAGE_1_OPERATORS_1_DOCUMENTATION)
-                    .build(),
-            Operator.builder()
-                    .id(IMAGE_1_OPERATORS_2_ID)
-                    .image(IMAGE_1)
-                    .displayName(IMAGE_1_OPERATORS_2_DISPLAY_NAME)
-                    .value(IMAGE_1_OPERATORS_2_VALUE)
-                    .documentation(IMAGE_1_OPERATORS_2_DOCUMENTATION)
-                    .build()));
-
-    public static final List<OperatorDto> IMAGE_1_OPERATORS_DTO = new LinkedList<>(List.of(
-            OperatorDto.builder()
-                    .id(IMAGE_1_OPERATORS_1_ID)
-                    .displayName(IMAGE_1_OPERATORS_1_DISPLAY_NAME)
-                    .value(IMAGE_1_OPERATORS_1_VALUE)
-                    .documentation(IMAGE_1_OPERATORS_1_DOCUMENTATION)
-                    .build(),
-            OperatorDto.builder()
-                    .id(IMAGE_1_OPERATORS_2_ID)
-                    .displayName(IMAGE_1_OPERATORS_2_DISPLAY_NAME)
-                    .value(IMAGE_1_OPERATORS_2_VALUE)
-                    .documentation(IMAGE_1_OPERATORS_2_DOCUMENTATION)
-                    .build()));
-
-    public static final UUID CONTAINER_1_ID = UUID.fromString("7ddb7e87-b965-43a2-9a24-4fa406d998f4");
-    public static final String CONTAINER_1_NAME = "u01";
-    public static final String CONTAINER_1_INTERNALNAME = "dbrepo-userdb-u01";
-    public static final String CONTAINER_1_UI_HOST = "localhost";
-    public static final Integer CONTAINER_1_UI_PORT = 3306;
-    public static final String CONTAINER_1_UI_ADDITIONAL_FLAGS = "?sslMode=disable";
-    public static final Integer CONTAINER_1_QUOTA = 4;
-    public static final Integer CONTAINER_1_COUNT = 3;
-    public static final String CONTAINER_1_HOST = "localhost";
-    public static final Integer CONTAINER_1_PORT = 3308;
-    public static final String CONTAINER_1_PRIVILEGED_USERNAME = "root";
-    @SuppressWarnings("java:S2068")
-    public static final String CONTAINER_1_PRIVILEGED_PASSWORD = "dbrepo";
-    public static final Instant CONTAINER_1_CREATED = Instant.ofEpochSecond(1677399629L) /* 2023-02-26 08:20:29 (UTC) */;
-
-    public static final Container CONTAINER_1 = Container.builder()
-            .id(CONTAINER_1_ID)
-            .name(CONTAINER_1_NAME)
-            .internalName(CONTAINER_1_INTERNALNAME)
-            .image(IMAGE_1)
-            .created(CONTAINER_1_CREATED)
-            .host(CONTAINER_1_HOST)
-            .port(CONTAINER_1_PORT)
-            .uiHost(CONTAINER_1_UI_HOST)
-            .uiPort(CONTAINER_1_UI_PORT)
-            .quota(CONTAINER_1_QUOTA)
-            .uiAdditionalFlags(CONTAINER_1_UI_ADDITIONAL_FLAGS)
-            .privilegedUsername(CONTAINER_1_PRIVILEGED_USERNAME)
-            .privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
-            .databases(null) /* DATABASE_1, DATABASE_2, DATABASE_3 */
-            .build();
-
-    public static final ContainerDto CONTAINER_1_DTO = ContainerDto.builder()
-            .id(CONTAINER_1_ID)
-            .name(CONTAINER_1_NAME)
-            .internalName(CONTAINER_1_INTERNALNAME)
-            .image(IMAGE_1_DTO)
-            .host(CONTAINER_1_HOST)
-            .port(CONTAINER_1_PORT)
-            .build();
-
-    public static final ContainerBriefDto CONTAINER_1_BRIEF_DTO = ContainerBriefDto.builder()
-            .id(CONTAINER_1_ID)
-            .name(CONTAINER_1_NAME)
-            .internalName(CONTAINER_1_INTERNALNAME)
-            .quota(CONTAINER_1_QUOTA)
-            .count(CONTAINER_1_COUNT)
-            .image(IMAGE_1_BRIEF_DTO)
-            .build();
-
-    public static final ContainerDto CONTAINER_1_PRIVILEGED_DTO = ContainerDto.builder()
-            .id(CONTAINER_1_ID)
-            .name(CONTAINER_1_NAME)
-            .internalName(CONTAINER_1_INTERNALNAME)
-            .image(IMAGE_1_DTO)
-            .host(CONTAINER_1_HOST)
-            .port(CONTAINER_1_PORT)
-            .lastRetrieved(Instant.now())
-            .username(CONTAINER_1_PRIVILEGED_USERNAME)
-            .password(CONTAINER_1_PRIVILEGED_PASSWORD)
-            .build();
-
-    public static final UUID CONTAINER_2_ID = UUID.fromString("c2ec601e-2bfb-4be8-8891-0cb804a08d4a");
-    public static final ContainerImage CONTAINER_2_IMAGE = IMAGE_1;
-    public static final ImageDto CONTAINER_2_IMAGE_DTO = IMAGE_1_DTO;
-    public static final String CONTAINER_2_NAME = "u02";
-    public static final String CONTAINER_2_INTERNALNAME = "dbrepo-userdb-u02";
-    public static final String CONTAINER_2_HOST = "localhost";
-    public static final Integer CONTAINER_2_PORT = 3309;
-    public static final Integer CONTAINER_2_QUOTA = 3;
-    public static final Integer CONTAINER_2_COUNT = 3;
-    public static final String CONTAINER_2_PRIVILEGED_USERNAME = "root";
-    @SuppressWarnings("java:S2068")
-    public static final String CONTAINER_2_PRIVILEGED_PASSWORD = "dbrepo";
-    public static final Instant CONTAINER_2_CREATED = Instant.ofEpochSecond(1677399655L) /* 2023-02-26 08:20:55 (UTC) */;
-
-    public static final Container CONTAINER_2 = Container.builder()
-            .id(CONTAINER_2_ID)
-            .name(CONTAINER_2_NAME)
-            .internalName(CONTAINER_2_INTERNALNAME)
-            .image(CONTAINER_2_IMAGE)
-            .created(CONTAINER_2_CREATED)
-            .host(CONTAINER_2_HOST)
-            .port(CONTAINER_2_PORT)
-            .quota(CONTAINER_2_QUOTA)
-            .databases(new LinkedList<>(List.of()))
-            .privilegedUsername(CONTAINER_2_PRIVILEGED_USERNAME)
-            .privilegedPassword(CONTAINER_2_PRIVILEGED_PASSWORD)
-            .build();
-
-    public static final ContainerDto CONTAINER_2_DTO = ContainerDto.builder()
-            .id(CONTAINER_2_ID)
-            .name(CONTAINER_2_NAME)
-            .internalName(CONTAINER_2_INTERNALNAME)
-            .image(CONTAINER_2_IMAGE_DTO)
-            .host(CONTAINER_2_HOST)
-            .port(CONTAINER_2_PORT)
-            .build();
-
-    public static final ContainerBriefDto CONTAINER_2_DTO_BRIEF = ContainerBriefDto.builder()
-            .id(CONTAINER_2_ID)
-            .name(CONTAINER_2_NAME)
-            .internalName(CONTAINER_2_INTERNALNAME)
-            .quota(CONTAINER_2_QUOTA)
-            .build();
-
-    public static final ContainerDto CONTAINER_2_PRIVILEGED_DTO = ContainerDto.builder()
-            .id(CONTAINER_2_ID)
-            .name(CONTAINER_2_NAME)
-            .internalName(CONTAINER_2_INTERNALNAME)
-            .image(CONTAINER_2_IMAGE_DTO)
-            .host(CONTAINER_2_HOST)
-            .port(CONTAINER_2_PORT)
-            .lastRetrieved(Instant.now())
-            .username(CONTAINER_2_PRIVILEGED_USERNAME)
-            .password(CONTAINER_2_PRIVILEGED_PASSWORD)
-            .build();
-
-    public static final UUID CONTAINER_3_ID = UUID.fromString("1731c7d2-8bd1-4392-85bc-18a3be99e01d");
-    public static final ContainerImage CONTAINER_3_IMAGE = IMAGE_1;
-    public static final String CONTAINER_3_NAME = "u03";
-    public static final String CONTAINER_3_INTERNALNAME = "dbrepo-userdb-u03";
-    public static final String CONTAINER_3_HOST = "localhost";
-    public static final Integer CONTAINER_3_PORT = 3310;
-    public static final Integer CONTAINER_3_QUOTA = 20;
-    public static final String CONTAINER_3_PRIVILEGED_USERNAME = "root";
-    @SuppressWarnings("java:S2068")
-    public static final String CONTAINER_3_PRIVILEGED_PASSWORD = "dbrepo";
-    public static final Instant CONTAINER_3_CREATED = Instant.ofEpochSecond(1677399672L) /* 2023-02-26 08:21:12 (UTC) */;
-
-    public static final Container CONTAINER_3 = Container.builder()
-            .id(CONTAINER_3_ID)
-            .name(CONTAINER_3_NAME)
-            .internalName(CONTAINER_3_INTERNALNAME)
-            .image(CONTAINER_3_IMAGE)
-            .created(CONTAINER_3_CREATED)
-            .host(CONTAINER_3_HOST)
-            .port(CONTAINER_3_PORT)
-            .quota(CONTAINER_3_QUOTA)
-            .databases(new LinkedList<>(List.of()))
-            .privilegedUsername(CONTAINER_3_PRIVILEGED_USERNAME)
-            .privilegedPassword(CONTAINER_3_PRIVILEGED_PASSWORD)
-            .build();
-
-    public static final UUID CONTAINER_4_ID = UUID.fromString("67aee75c-791c-410b-abbb-175c11ddd252");
-    public static final ContainerImage CONTAINER_4_IMAGE = IMAGE_1;
-    public static final String CONTAINER_4_NAME = "u04";
-    public static final String CONTAINER_4_INTERNALNAME = "dbrepo-userdb-u04";
-    public static final String CONTAINER_4_HOST = "localhost";
-    public static final Integer CONTAINER_4_PORT = 3311;
-    public static final Integer CONTAINER_4_QUOTA = 0;
-    public static final String CONTAINER_4_PRIVILEGED_USERNAME = "root";
-    @SuppressWarnings("java:S2068")
-    public static final String CONTAINER_4_PRIVILEGED_PASSWORD = "dbrepo";
-    public static final Instant CONTAINER_4_CREATED = Instant.ofEpochSecond(1677399688L) /* 2023-02-26 08:21:28 (UTC) */;
-
-    public static final Container CONTAINER_4 = Container.builder()
-            .id(CONTAINER_4_ID)
-            .name(CONTAINER_4_NAME)
-            .internalName(CONTAINER_4_INTERNALNAME)
-            .image(CONTAINER_4_IMAGE)
-            .created(CONTAINER_4_CREATED)
-            .host(CONTAINER_4_HOST)
-            .port(CONTAINER_4_PORT)
-            .quota(CONTAINER_4_QUOTA)
-            .privilegedUsername(CONTAINER_4_PRIVILEGED_USERNAME)
-            .privilegedPassword(CONTAINER_4_PRIVILEGED_PASSWORD)
-            .databases(null) /* DATABASE_4 */
-            .build();
-
     public static final String EXCHANGE_DBREPO_NAME = "dbrepo";
     public static final Boolean EXCHANGE_DBREPO_AUTO_DELETE = true;
     public static final Boolean EXCHANGE_DBREPO_DURABLE = true;
@@ -817,27 +602,15 @@ public class BaseTest {
             .internal(EXCHANGE_DBREPO_INTERNAL)
             .build();
 
-    public static final UUID DATABASE_1_ID = UUID.fromString("b3bcb5bf-4f88-40e2-9726-9b0d2ee2b425");
-    public static final String DATABASE_1_NAME = "Weather";
-    public static final String DATABASE_1_DESCRIPTION = "Weather in Australia";
-    public static final String DATABASE_1_DASHBOARD_UID = "2c7b6aeae843e41cf75b";
-    public static final String DATABASE_1_INTERNALNAME = "weather";
-    public static final Boolean DATABASE_1_PUBLIC = false;
-    public static final Boolean DATABASE_1_SCHEMA_PUBLIC = false;
-    public static final Boolean DATABASE_1_DASHBOARD_ENABLED = false;
-    public static final String DATABASE_1_EXCHANGE = "dbrepo";
-    public static final Instant DATABASE_1_CREATED = Instant.ofEpochSecond(1677399741L) /* 2023-02-26 08:22:21 (UTC) */;
-    public static final Instant DATABASE_1_LAST_MODIFIED = Instant.ofEpochSecond(1677399741L) /* 2023-02-26 08:22:21 (UTC) */;
-
     public static final CreateDatabaseDto DATABASE_1_CREATE = CreateDatabaseDto.builder()
-            .name(DATABASE_1_NAME)
-            .isPublic(DATABASE_1_PUBLIC)
-            .cid(CONTAINER_1_ID)
+            .name(DATABASE_1.getName())
+            .isPublic(DATABASE_1.getIsPublic())
+            .cid(CONTAINER_1.getId())
             .build();
 
     public static final at.ac.tuwien.ifs.dbrepo.core.api.database.internal.CreateDatabaseDto DATABASE_1_CREATE_INTERNAL = at.ac.tuwien.ifs.dbrepo.core.api.database.internal.CreateDatabaseDto.builder()
-            .internalName(DATABASE_1_INTERNALNAME)
-            .containerId(CONTAINER_1_ID)
+            .internalName(DATABASE_1.getInternalName())
+            .containerId(CONTAINER_1.getId())
             .username(USER_1.getUsername())
             .password(USER_1_PASSWORD)
             .userId(USER_1.getId())
@@ -845,468 +618,36 @@ public class BaseTest {
             .privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
             .build();
 
-    public static final UUID DATABASE_2_ID = UUID.fromString("dd9dfee2-9fbd-46b0-92d5-98f0f8866ffe");
-    public static final String DATABASE_2_NAME = "Zoo";
-    public static final String DATABASE_2_DESCRIPTION = "Zoo data";
-    public static final String DATABASE_2_DASHBOARD_UID = "7779bc9207daeae7e5a7";
-    public static final String DATABASE_2_INTERNALNAME = "zoo";
-    public static final Boolean DATABASE_2_PUBLIC = false;
-    public static final Boolean DATABASE_2_SCHEMA_PUBLIC = true;
-    public static final Boolean DATABASE_2_DASHBOARD_ENABLED = true;
-    public static final String DATABASE_2_EXCHANGE = "dbrepo";
-    public static final Instant DATABASE_2_CREATED = Instant.ofEpochSecond(1677399772L) /* 2023-02-26 08:22:52 (UTC) */;
-    public static final Instant DATABASE_2_LAST_MODIFIED = Instant.ofEpochSecond(1677399772L) /* 2023-02-26 08:22:52 (UTC) */;
-
     public static final CreateDatabaseDto DATABASE_2_CREATE = CreateDatabaseDto.builder()
             .name(DATABASE_2_NAME)
             .isPublic(DATABASE_2_PUBLIC)
-            .cid(CONTAINER_1_ID)
+            .cid(CONTAINER_1.getId())
             .build();
 
-    public static final UUID DATABASE_3_ID = UUID.fromString("9d8cb9a9-9468-4801-a2e0-2dac8bc67c31");
-    public static final String DATABASE_3_NAME = "Musicology";
-    public static final String DATABASE_3_DESCRIPTION = "Musicology data";
-    public static final String DATABASE_3_DASHBOARD_UID = "18d25f581fb272ac260b";
-    public static final String DATABASE_3_INTERNALNAME = "musicology";
-    public static final Boolean DATABASE_3_PUBLIC = true;
-    public static final Boolean DATABASE_3_SCHEMA_PUBLIC = false;
-    public static final Boolean DATABASE_3_DASHBOARD_ENABLED = true;
-    public static final String DATABASE_3_EXCHANGE = "dbrepo";
-    public static final Instant DATABASE_3_CREATED = Instant.ofEpochSecond(1677399792L) /* 2023-02-26 08:23:12 (UTC) */;
-    public static final Instant DATABASE_3_LAST_MODIFIED = Instant.ofEpochSecond(1677399792L) /* 2023-02-26 08:23:12 (UTC) */;
-
-    public static final DatabaseDto DATABASE_3_DTO = DatabaseDto.builder()
-            .id(DATABASE_3_ID)
-            .isPublic(DATABASE_3_PUBLIC)
-            .isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
-            .name(DATABASE_3_NAME)
-            .description(DATABASE_3_DESCRIPTION)
-            .dashboardUid(DATABASE_3_DASHBOARD_UID)
-            .internalName(DATABASE_3_INTERNALNAME)
-            .owner(USER_3_BRIEF_DTO)
-            .container(CONTAINER_1_DTO)
-            .exchangeName(DATABASE_3_EXCHANGE)
-            .tables(new LinkedList<>()) /* TABLE_8_DTO */
-            .views(new LinkedList<>()) /* VIEW_5_DTO */
-            .identifiers(new LinkedList<>()) /* IDENTIFIER_6_DTO */
-            .build();
-
-    public static final DatabaseDto DATABASE_3_PRIVILEGED_DTO = DatabaseDto.builder()
-            .id(DATABASE_3_ID)
-            .isPublic(DATABASE_3_PUBLIC)
-            .isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
-            .name(DATABASE_3_NAME)
-            .internalName(DATABASE_3_INTERNALNAME)
-            .owner(USER_3_BRIEF_DTO)
-            .container(CONTAINER_1_PRIVILEGED_DTO)
-            .exchangeName(DATABASE_3_EXCHANGE)
-            .tables(new LinkedList<>()) /* TABLE_8_DTO */
-            .views(new LinkedList<>()) /* VIEW_5_DTO */
-            .identifiers(new LinkedList<>()) /* IDENTIFIER_6_DTO */
-            .lastRetrieved(Instant.now())
-            .build();
-
-    public static final DatabaseBriefDto DATABASE_3_PRIVILEGED_BRIEF_DTO = DatabaseBriefDto.builder()
-            .id(DATABASE_3_ID)
-            .isPublic(DATABASE_3_PUBLIC)
-            .isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
-            .name(DATABASE_3_NAME)
-            .internalName(DATABASE_3_INTERNALNAME)
-            .ownerId(USER_3.getId())
-            .identifiers(new LinkedList<>()) /* IDENTIFIER_6_DTO */
-            .build();
-
-    public static final DatabaseBriefDto DATABASE_3_BRIEF_DTO = DatabaseBriefDto.builder()
-            .id(DATABASE_3_ID)
-            .isPublic(DATABASE_3_PUBLIC)
-            .isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
-            .name(DATABASE_3_NAME)
-            .internalName(DATABASE_3_INTERNALNAME)
-            .ownerId(USER_3.getId())
-            .identifiers(new LinkedList<>())
+    public static final at.ac.tuwien.ifs.dbrepo.core.api.database.internal.CreateDatabaseDto DATABASE_2_CREATE_INTERNAL = at.ac.tuwien.ifs.dbrepo.core.api.database.internal.CreateDatabaseDto.builder()
+            .internalName(DATABASE_2.getInternalName())
+            .containerId(CONTAINER_1.getId())
+            .username(USER_1.getUsername())
+            .password(USER_1_PASSWORD)
+            .userId(USER_1.getId())
+            .privilegedUsername(CONTAINER_1_PRIVILEGED_USERNAME)
+            .privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
             .build();
 
     public static final CreateDatabaseDto DATABASE_3_CREATE = CreateDatabaseDto.builder()
             .name(DATABASE_3_NAME)
             .isPublic(DATABASE_3_PUBLIC)
-            .cid(CONTAINER_1_ID)
-            .build();
-
-    public static final UUID DATABASE_4_ID = UUID.fromString("c503d7f3-5952-4d97-b26a-da86bea4c20d");
-    public static final String DATABASE_4_NAME = "Weather AT";
-    public static final String DATABASE_4_DESCRIPTION = "Weather data";
-    public static final String DATABASE_4_DASHBOARD_UID = "456a3760f69821a0f944";
-    public static final Boolean DATABASE_4_PUBLIC = true;
-    public static final Boolean DATABASE_4_SCHEMA_PUBLIC = true;
-    public static final Boolean DATABASE_4_DASHBOARD_ENABLED = true;
-    public static final String DATABASE_4_INTERNALNAME = "weather_at";
-    public static final String DATABASE_4_EXCHANGE = "dbrepo";
-    public static final Instant DATABASE_4_CREATED = Instant.ofEpochSecond(1677399813L) /* 2023-02-26 08:23:33 (UTC) */;
-    public static final Instant DATABASE_4_LAST_MODIFIED = Instant.ofEpochSecond(1677399813L) /* 2023-02-26 08:23:33 (UTC) */;
-
-    public static final DatabaseBriefDto DATABASE_4_BRIEF_DTO = DatabaseBriefDto.builder()
-            .id(DATABASE_4_ID)
-            .isPublic(DATABASE_4_PUBLIC)
-            .isSchemaPublic(DATABASE_4_SCHEMA_PUBLIC)
-            .name(DATABASE_4_NAME)
-            .description(DATABASE_4_DESCRIPTION)
-            .internalName(DATABASE_4_INTERNALNAME)
-            .ownerId(USER_4.getId())
-            .identifiers(new LinkedList<>())
-            .build();
-
-    public static final DatabaseDto DATABASE_4_DTO = DatabaseDto.builder()
-            .id(DATABASE_4_ID)
-            .isPublic(DATABASE_4_PUBLIC)
-            .isSchemaPublic(DATABASE_4_SCHEMA_PUBLIC)
-            .name(DATABASE_4_NAME)
-            .description(DATABASE_4_DESCRIPTION)
-            .dashboardUid(DATABASE_4_DASHBOARD_UID)
-            .container(CONTAINER_2_DTO)
-            .description(DATABASE_4_DESCRIPTION)
-            .internalName(DATABASE_4_INTERNALNAME)
-            .exchangeName(DATABASE_4_EXCHANGE)
-            .owner(USER_4_BRIEF_DTO)
-            .tables(new LinkedList<>()) /* TABLE_9_DTO */
-            .views(new LinkedList<>())
-            .identifiers(new LinkedList<>()) /* IDENTIFIER_7_DTO */
-            .build();
-
-    public static final DatabaseDto DATABASE_4_PRIVILEGED_DTO = DatabaseDto.builder()
-            .id(DATABASE_4_ID)
-            .isPublic(DATABASE_4_PUBLIC)
-            .isSchemaPublic(DATABASE_4_SCHEMA_PUBLIC)
-            .name(DATABASE_4_NAME)
-            .container(CONTAINER_2_PRIVILEGED_DTO)
-            .description(DATABASE_4_DESCRIPTION)
-            .internalName(DATABASE_4_INTERNALNAME)
-            .exchangeName(DATABASE_4_EXCHANGE)
-            .owner(USER_4_BRIEF_DTO)
-            .tables(new LinkedList<>()) /* TABLE_9_DTO */
-            .views(new LinkedList<>())
-            .identifiers(new LinkedList<>()) /* IDENTIFIER_7_DTO */
-            .lastRetrieved(Instant.now())
+            .cid(CONTAINER_1.getId())
             .build();
 
-    public static final CreateTableDto TABLE_0_CREATE_DTO = CreateTableDto.builder()
-            .name("full")
-            .description("full example")
-            .constraints(CreateTableConstraintsDto.builder()
-                    .uniques(new LinkedList<>())
-                    .foreignKeys(new LinkedList<>())
-                    .build())
-            .columns(List.of(CreateTableColumnDto.builder()
-                            .name("col1a")
-                            .type(ColumnTypeDto.CHAR)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col1b")
-                            .type(ColumnTypeDto.CHAR)
-                            .nullAllowed(true)
-                            .size(50L)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col2a")
-                            .type(ColumnTypeDto.VARCHAR)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col2b")
-                            .type(ColumnTypeDto.VARCHAR)
-                            .nullAllowed(true)
-                            .size(1024L)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col3")
-                            .type(ColumnTypeDto.BINARY)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col4")
-                            .type(ColumnTypeDto.VARBINARY)
-                            .nullAllowed(true)
-                            .size(200L)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col5")
-                            .type(ColumnTypeDto.TINYBLOB)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col6")
-                            .type(ColumnTypeDto.TINYTEXT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col7")
-                            .type(ColumnTypeDto.TEXT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col8")
-                            .type(ColumnTypeDto.BLOB)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col9")
-                            .type(ColumnTypeDto.MEDIUMTEXT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col10")
-                            .type(ColumnTypeDto.MEDIUMBLOB)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col11")
-                            .type(ColumnTypeDto.LONGTEXT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col12")
-                            .type(ColumnTypeDto.LONGBLOB)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col13")
-                            .type(ColumnTypeDto.ENUM)
-                            .nullAllowed(true)
-                            .enums(new LinkedList<>(List.of("val1", "val2")))
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col14")
-                            .type(ColumnTypeDto.SET)
-                            .nullAllowed(true)
-                            .sets(new LinkedList<>(List.of("val1", "val2")))
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col15")
-                            .type(ColumnTypeDto.BIT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col16")
-                            .type(ColumnTypeDto.TINYINT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col17")
-                            .type(ColumnTypeDto.BOOL)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col18")
-                            .type(ColumnTypeDto.SMALLINT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col19")
-                            .type(ColumnTypeDto.MEDIUMINT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col20")
-                            .type(ColumnTypeDto.INT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col21")
-                            .type(ColumnTypeDto.BIGINT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col22")
-                            .type(ColumnTypeDto.FLOAT)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col23")
-                            .type(ColumnTypeDto.DOUBLE)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col24")
-                            .type(ColumnTypeDto.DECIMAL)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col25")
-                            .type(ColumnTypeDto.DATE)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col26")
-                            .type(ColumnTypeDto.DATETIME)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col27")
-                            .type(ColumnTypeDto.TIMESTAMP)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col28")
-                            .type(ColumnTypeDto.TIME)
-                            .nullAllowed(true)
-                            .build(),
-                    CreateTableColumnDto.builder()
-                            .name("col29")
-                            .type(ColumnTypeDto.YEAR)
-                            .nullAllowed(true)
-                            .build()))
-            .build();
-
-    public static final UUID TABLE_1_ID = UUID.fromString("666d0b6b-f017-4f7c-80d8-a47174d8b539");
-    public static final String TABLE_1_NAME = "Weather AUS";
-    public static final String TABLE_1_INTERNAL_NAME = "weather_aus";
-    public static final Boolean TABLE_1_VERSIONED = true;
-    public static final Boolean TABLE_1_IS_PUBLIC = false;
-    public static final Boolean TABLE_1_SCHEMA_PUBLIC = false;
-    public static final Boolean TABLE_1_PROCESSED_CONSTRAINTS = true;
-    public static final String TABLE_1_DESCRIPTION = "Weather in Australia";
-    public static final String TABLE_1_QUEUE_NAME = TABLE_1_INTERNAL_NAME;
-    public static final String TABLE_1_ROUTING_KEY = "dbrepo." + DATABASE_1_ID + "." + TABLE_1_ID;
-    public static final Long TABLE_1_AVG_ROW_LENGTH = 3L;
-    public static final Long TABLE_1_NUM_ROWS = 3L;
-    public static final Long TABLE_1_DATA_LENGTH = 2000L;
-    public static final Long TABLE_1_MAX_DATA_LENGTH = Long.MAX_VALUE;
-    public static final Instant TABLE_1_CREATED = Instant.ofEpochSecond(1677399975L) /* 2023-02-26 08:26:15 (UTC) */;
-    public static final Instant TABLE_1_LAST_MODIFIED = Instant.ofEpochSecond(1677399975L) /* 2023-02-26 08:26:15 (UTC) */;
-
-    public static final Table TABLE_1 = Table.builder()
-            .id(TABLE_1_ID)
-            .tdbid(DATABASE_1_ID)
-            .database(null /* DATABASE_1 */)
-            .created(TABLE_1_CREATED)
-            .internalName(TABLE_1_INTERNAL_NAME)
-            .isVersioned(TABLE_1_VERSIONED)
-            .isPublic(TABLE_1_IS_PUBLIC)
-            .isSchemaPublic(TABLE_1_SCHEMA_PUBLIC)
-            .description(TABLE_1_DESCRIPTION)
-            .name(TABLE_1_NAME)
-            .queueName(TABLE_1_QUEUE_NAME)
-            .identifiers(new LinkedList<>())
-            .columns(new LinkedList<>() /* TABLE_1_COLUMNS */)
-            .constraints(null) /* TABLE_1_CONSTRAINTS */
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .lastModified(TABLE_1_LAST_MODIFIED)
-            .avgRowLength(TABLE_1_AVG_ROW_LENGTH)
-            .numRows(TABLE_1_NUM_ROWS)
-            .dataLength(TABLE_1_DATA_LENGTH)
-            .maxDataLength(TABLE_1_MAX_DATA_LENGTH)
-            .build();
-
-    public static final TableDto TABLE_1_DTO = TableDto.builder()
-            .id(TABLE_1_ID)
-            .databaseId(DATABASE_1_ID)
-            .internalName(TABLE_1_INTERNAL_NAME)
-            .isVersioned(TABLE_1_VERSIONED)
-            .isPublic(TABLE_1_IS_PUBLIC)
-            .isSchemaPublic(TABLE_1_SCHEMA_PUBLIC)
-            .description(TABLE_1_DESCRIPTION)
-            .name(TABLE_1_NAME)
-            .queueName(TABLE_1_QUEUE_NAME)
-            .routingKey(TABLE_1_ROUTING_KEY)
-            .identifiers(new LinkedList<>())
-            .columns(new LinkedList<>() /* TABLE_1_COLUMNS_DTO */)
-            .constraints(null) /* TABLE_1_CONSTRAINTS_DTO */
-            .owner(USER_1_BRIEF_DTO)
-            .avgRowLength(TABLE_1_AVG_ROW_LENGTH)
-            .numRows(TABLE_1_NUM_ROWS)
-            .dataLength(TABLE_1_DATA_LENGTH)
-            .maxDataLength(TABLE_1_MAX_DATA_LENGTH)
-            .build();
-
-    public static final UUID COLUMN_1_1_ID = UUID.fromString("377c0a6e-938e-458c-ad2b-bbbd75d46412");
-
-    public static final UUID COLUMN_1_2_ID = UUID.fromString("dbca4821-3023-479b-a25a-c08eb0ec02ce");
-
-    public static final UUID COLUMN_1_3_ID = UUID.fromString("8ff0351e-4882-4948-94af-598e4b264b25");
-
-    public static final UUID COLUMN_1_4_ID = UUID.fromString("9ab256eb-3324-4e76-af3b-e3e2a58ce161");
-
-    public static final UUID COLUMN_1_5_ID = UUID.fromString("619e9355-51aa-438f-8579-80cec30f35cb");
-
-    public static final List<ColumnDto> TABLE_1_COLUMNS_DTO = List.of(ColumnDto.builder()
-                    .id(COLUMN_1_1_ID)
-                    .tableId(TABLE_1_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(0)
-                    .name("id")
-                    .internalName("id")
-                    .columnType(ColumnTypeDto.SERIAL)
-                    .isNullAllowed(false)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_1_2_ID)
-                    .tableId(TABLE_1_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(1)
-                    .name("Date")
-                    .internalName("date")
-                    .columnType(ColumnTypeDto.DATE)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_1_3_ID)
-                    .tableId(TABLE_1_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(2)
-                    .name("Location")
-                    .internalName("location")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_1_4_ID)
-                    .tableId(TABLE_1_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(3)
-                    .name("MinTemp")
-                    .internalName("mintemp")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_1_5_ID)
-                    .tableId(TABLE_1_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(4)
-                    .name("Rainfall")
-                    .internalName("rainfall")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .concept(CONCEPT_1_BRIEF_DTO)
-                    .unit(UNIT_1_BRIEF_DTO)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build());
-
-    public static final TableBriefDto TABLE_1_BRIEF_DTO = TableBriefDto.builder()
-            .id(TABLE_1_ID)
-            .databaseId(DATABASE_1_ID)
-            .internalName(TABLE_1_INTERNAL_NAME)
-            .isVersioned(TABLE_1_VERSIONED)
-            .isPublic(TABLE_1_IS_PUBLIC)
-            .isSchemaPublic(TABLE_1_SCHEMA_PUBLIC)
-            .description(TABLE_1_DESCRIPTION)
-            .name(TABLE_1_NAME)
-            .ownedBy(USER_1.getId())
+    public static final at.ac.tuwien.ifs.dbrepo.core.api.database.internal.CreateDatabaseDto DATABASE_3_CREATE_INTERNAL = at.ac.tuwien.ifs.dbrepo.core.api.database.internal.CreateDatabaseDto.builder()
+            .internalName(DATABASE_3.getInternalName())
+            .containerId(CONTAINER_1.getId())
+            .username(USER_1.getUsername())
+            .password(USER_1_PASSWORD)
+            .userId(USER_1.getId())
+            .privilegedUsername(CONTAINER_1_PRIVILEGED_USERNAME)
+            .privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
             .build();
 
     public static final Long TABLE_1_DATA_COUNT = 3L;
@@ -1335,766 +676,8 @@ public class BaseTest {
             }}
     ));
 
-    public static final UUID TABLE_2_ID = UUID.fromString("0cc067b6-4e81-4871-b47e-17a38228a574");
-    public static final String TABLE_2_NAME = "Weather Location";
-    public static final String TABLE_2_INTERNALNAME = "weather_location";
-    public static final Boolean TABLE_2_VERSIONED = true;
-    public static final Boolean TABLE_2_IS_PUBLIC = false;
-    public static final Boolean TABLE_2_SCHEMA_PUBLIC = true;
-    public static final Boolean TABLE_2_PROCESSED_CONSTRAINTS = true;
-    public static final String TABLE_2_DESCRIPTION = "Weather location";
-    public static final String TABLE_2_QUEUE_NAME = TABLE_2_INTERNALNAME;
-    public static final String TABLE_2_ROUTING_KEY = "dbrepo." + DATABASE_1_ID + "." + TABLE_2_ID;
-    public static final Instant TABLE_2_CREATED = Instant.ofEpochSecond(1677400007L) /* 2023-02-26 08:26:47 (UTC) */;
-    public static final Instant TABLE_2_LAST_MODIFIED = Instant.ofEpochSecond(1677400007L) /* 2023-02-26 08:26:47 (UTC) */;
-    public static final Long TABLE_2_AVG_ROW_LENGTH = 3L;
-    public static final Long TABLE_2_NUM_ROWS = 3L;
-    public static final Long TABLE_2_DATA_LENGTH = 2000L;
-    public static final Long TABLE_2_MAX_DATA_LENGTH = Long.MAX_VALUE;
-
-    public static final Table TABLE_2 = Table.builder()
-            .id(TABLE_2_ID)
-            .tdbid(DATABASE_1_ID)
-            .database(null /* DATABASE_1 */)
-            .created(TABLE_2_CREATED)
-            .internalName(TABLE_2_INTERNALNAME)
-            .isVersioned(TABLE_2_VERSIONED)
-            .isPublic(TABLE_2_IS_PUBLIC)
-            .isSchemaPublic(TABLE_2_SCHEMA_PUBLIC)
-            .description(TABLE_2_DESCRIPTION)
-            .name(TABLE_2_NAME)
-            .lastModified(TABLE_2_LAST_MODIFIED)
-            .queueName(TABLE_2_QUEUE_NAME)
-            .columns(new LinkedList<>() /* TABLE_2_COLUMNS */)
-            .constraints(null) /* TABLE_2_CONSTRAINTS */
-            .owner(USER_2)
-            .ownedBy(USER_2.getId())
-            .avgRowLength(TABLE_2_AVG_ROW_LENGTH)
-            .numRows(TABLE_2_NUM_ROWS)
-            .dataLength(TABLE_2_DATA_LENGTH)
-            .maxDataLength(TABLE_2_MAX_DATA_LENGTH)
-            .build();
-
-    public static final TableDto TABLE_2_DTO = TableDto.builder()
-            .id(TABLE_2_ID)
-            .databaseId(DATABASE_1_ID)
-            .internalName(TABLE_2_INTERNALNAME)
-            .isVersioned(TABLE_2_VERSIONED)
-            .isPublic(TABLE_2_IS_PUBLIC)
-            .isSchemaPublic(TABLE_2_SCHEMA_PUBLIC)
-            .description(TABLE_2_DESCRIPTION)
-            .name(TABLE_2_NAME)
-            .queueName(TABLE_2_QUEUE_NAME)
-            .routingKey(TABLE_2_ROUTING_KEY)
-            .columns(new LinkedList<>() /* TABLE_2_COLUMNS_DTO */)
-            .constraints(null) /* TABLE_2_CONSTRAINTS_DTO */
-            .owner(USER_2_BRIEF_DTO)
-            .avgRowLength(TABLE_2_AVG_ROW_LENGTH)
-            .numRows(TABLE_2_NUM_ROWS)
-            .dataLength(TABLE_2_DATA_LENGTH)
-            .maxDataLength(TABLE_2_MAX_DATA_LENGTH)
-            .build();
-
-    public static final TableBriefDto TABLE_2_BRIEF_DTO = TableBriefDto.builder()
-            .id(TABLE_2_ID)
-            .databaseId(DATABASE_1_ID)
-            .internalName(TABLE_2_INTERNALNAME)
-            .isVersioned(TABLE_2_VERSIONED)
-            .isPublic(TABLE_2_IS_PUBLIC)
-            .isSchemaPublic(TABLE_2_SCHEMA_PUBLIC)
-            .description(TABLE_2_DESCRIPTION)
-            .name(TABLE_2_NAME)
-            .ownedBy(USER_2.getId())
-            .build();
-
-    public static final UUID TABLE_3_ID = UUID.fromString("a94ee518-c235-496b-8613-b0c643bc1b11");
-    public static final String TABLE_3_NAME = "Sensor";
-    public static final String TABLE_3_INTERNALNAME = "sensor";
-    public static final Boolean TABLE_3_VERSIONED = true;
-    public static final Boolean TABLE_3_IS_PUBLIC = false;
-    public static final Boolean TABLE_3_SCHEMA_PUBLIC = false;
-    public static final Boolean TABLE_3_PROCESSED_CONSTRAINTS = true;
-    public static final String TABLE_3_DESCRIPTION = "Some sensor data";
-    public static final String TABLE_3_QUEUE_NAME = TABLE_3_INTERNALNAME;
-    public static final String TABLE_3_ROUTING_KEY = "dbrepo." + DATABASE_1_ID + "." + TABLE_3_ID;
-    public static final Instant TABLE_3_CREATED = Instant.ofEpochSecond(1677400031L) /* 2023-02-26 08:27:11 (UTC) */;
-    public static final Instant TABLE_3_LAST_MODIFIED = Instant.ofEpochSecond(1677400031L) /* 2023-02-26 08:27:11 (UTC) */;
-    public static final Long TABLE_3_AVG_ROW_LENGTH = 6L;
-    public static final Long TABLE_3_NUM_ROWS = 6L;
-    public static final Long TABLE_3_DATA_LENGTH = 1800L;
-    public static final Long TABLE_3_MAX_DATA_LENGTH = Long.MAX_VALUE;
-
-    public static final Table TABLE_3 = Table.builder()
-            .id(TABLE_3_ID)
-            .tdbid(DATABASE_1_ID)
-            .database(null /* DATABASE_1 */)
-            .created(TABLE_3_CREATED)
-            .internalName(TABLE_3_INTERNALNAME)
-            .isVersioned(TABLE_3_VERSIONED)
-            .isPublic(TABLE_3_IS_PUBLIC)
-            .isSchemaPublic(TABLE_3_SCHEMA_PUBLIC)
-            .description(TABLE_3_DESCRIPTION)
-            .name(TABLE_3_NAME)
-            .lastModified(TABLE_3_LAST_MODIFIED)
-            .queueName(TABLE_3_QUEUE_NAME)
-            .columns(new LinkedList<>() /* TABLE_3_COLUMNS */)
-            .constraints(null) /* TABLE_3_CONSTRAINTS */
-            .owner(USER_3)
-            .ownedBy(USER_3.getId())
-            .avgRowLength(TABLE_3_AVG_ROW_LENGTH)
-            .numRows(TABLE_3_NUM_ROWS)
-            .dataLength(TABLE_3_DATA_LENGTH)
-            .maxDataLength(TABLE_3_MAX_DATA_LENGTH)
-            .build();
-
-    public static final TableDto TABLE_3_DTO = TableDto.builder()
-            .id(TABLE_3_ID)
-            .databaseId(DATABASE_1_ID)
-            .internalName(TABLE_3_INTERNALNAME)
-            .isVersioned(TABLE_3_VERSIONED)
-            .isPublic(TABLE_3_IS_PUBLIC)
-            .isSchemaPublic(TABLE_3_SCHEMA_PUBLIC)
-            .description(TABLE_3_DESCRIPTION)
-            .name(TABLE_3_NAME)
-            .queueName(TABLE_3_QUEUE_NAME)
-            .routingKey(TABLE_3_ROUTING_KEY)
-            .columns(new LinkedList<>() /* TABLE_3_COLUMNS_DTO */)
-            .constraints(null) /* TABLE_3_CONSTRAINTS_DTO */
-            .owner(USER_3_BRIEF_DTO)
-            .avgRowLength(TABLE_3_AVG_ROW_LENGTH)
-            .numRows(TABLE_3_NUM_ROWS)
-            .dataLength(TABLE_3_DATA_LENGTH)
-            .maxDataLength(TABLE_3_MAX_DATA_LENGTH)
-            .build();
-
-    public static final TableBriefDto TABLE_3_BRIEF_DTO = TableBriefDto.builder()
-            .id(TABLE_3_ID)
-            .databaseId(DATABASE_1_ID)
-            .internalName(TABLE_3_INTERNALNAME)
-            .isVersioned(TABLE_3_VERSIONED)
-            .isPublic(TABLE_3_IS_PUBLIC)
-            .isSchemaPublic(TABLE_3_SCHEMA_PUBLIC)
-            .description(TABLE_3_DESCRIPTION)
-            .name(TABLE_3_NAME)
-            .ownedBy(USER_3.getId())
-            .build();
-
-    public static final CreateTableConstraintsDto TABLE_3_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
-            .checks(new LinkedHashSet<>())
-            .primaryKey(new LinkedHashSet<>())
-            .foreignKeys(new LinkedList<>())
-            .uniques(new LinkedList<>())
-            .build();
-
-    public static final CreateTableConstraintsDto TABLE_3_CONSTRAINTS_INVALID_CREATE_DTO = CreateTableConstraintsDto.builder()
-            .checks(new LinkedHashSet<>())
-            .primaryKey(new LinkedHashSet<>()) // <<<<
-            .uniques(new LinkedList<>())
-            .foreignKeys(List.of(CreateForeignKeyDto.builder()
-                    .referencedTable("weather_location")
-                    .columns(new LinkedList<>(List.of("fahrzeug")))
-                    .referencedColumns(new LinkedList<>(List.of("doesnotexist")))
-                    .build()))
-            .build();
-
-    public static final CreateTableDto TABLE_3_CREATE_DTO = CreateTableDto.builder()
-            .name(TABLE_3_NAME)
-            .description(TABLE_3_DESCRIPTION)
-            .columns(new LinkedList<>())
-            .constraints(TABLE_3_CONSTRAINTS_CREATE_DTO)
-            .build();
-
-    public static final CreateTableDto TABLE_3_INVALID_CREATE_DTO = CreateTableDto.builder()
-            .name(TABLE_3_NAME)
-            .description(TABLE_3_DESCRIPTION)
-            .columns(new LinkedList<>())
-            .constraints(TABLE_3_CONSTRAINTS_INVALID_CREATE_DTO)
-            .build();
-
-    public static final UUID TABLE_5_ID = UUID.fromString("91306cbd-c51f-47d3-8722-debfdbd8a77e");
-    public static final String TABLE_5_NAME = "zoo";
-    public static final String TABLE_5_INTERNAL_NAME = "zoo";
-    public static final Boolean TABLE_5_VERSIONED = true;
-    public static final Boolean TABLE_5_IS_PUBLIC = true;
-    public static final Boolean TABLE_5_SCHEMA_PUBLIC = true;
-    public static final Boolean TABLE_5_PROCESSED_CONSTRAINTS = true;
-    public static final String TABLE_5_DESCRIPTION = "Some Kaggle dataset";
-    public static final String TABLE_5_QUEUE_NAME = TABLE_5_INTERNAL_NAME;
-    public static final String TABLE_5_ROUTING_KEY = "dbrepo." + DATABASE_2_ID + "." + TABLE_5_ID;
-    public static final Instant TABLE_5_CREATED = Instant.ofEpochSecond(1677400067L) /* 2023-02-26 08:27:47 (UTC) */;
-    public static final Instant TABLE_5_LAST_MODIFIED = Instant.ofEpochSecond(1677400067L) /* 2023-02-26 08:27:47 (UTC) */;
-    public static final Long TABLE_5_AVG_ROW_LENGTH = 1080L;
-    public static final Long TABLE_5_NUM_ROWS = 101L;
-    public static final Long TABLE_5_DATA_LENGTH = 15200L;
-    public static final Long TABLE_5_MAX_DATA_LENGTH = Long.MAX_VALUE;
-
-    public static final Table TABLE_5 = Table.builder()
-            .id(TABLE_5_ID)
-            .tdbid(DATABASE_2_ID)
-            .created(Instant.now())
-            .internalName(TABLE_5_INTERNAL_NAME)
-            .isVersioned(TABLE_5_VERSIONED)
-            .isPublic(TABLE_5_IS_PUBLIC)
-            .isSchemaPublic(TABLE_5_SCHEMA_PUBLIC)
-            .description(TABLE_5_DESCRIPTION)
-            .name(TABLE_5_NAME)
-            .lastModified(TABLE_5_LAST_MODIFIED)
-            .queueName(TABLE_5_QUEUE_NAME)
-            .columns(new LinkedList<>()) /* TABLE_5_COLUMNS */
-            .constraints(null) /* TABLE_5_CONSTRAINTS */
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .build();
-
-    public static final TableDto TABLE_5_DTO = TableDto.builder()
-            .id(TABLE_5_ID)
-            .databaseId(DATABASE_2_ID)
-            .internalName(TABLE_5_INTERNAL_NAME)
-            .isVersioned(TABLE_5_VERSIONED)
-            .isPublic(TABLE_5_IS_PUBLIC)
-            .isSchemaPublic(TABLE_5_SCHEMA_PUBLIC)
-            .description(TABLE_5_DESCRIPTION)
-            .name(TABLE_5_NAME)
-            .queueName(TABLE_5_QUEUE_NAME)
-            .routingKey(TABLE_5_ROUTING_KEY)
-            .columns(new LinkedList<>()) /* TABLE_5_COLUMNS_DTO */
-            .constraints(null) /* TABLE_5_CONSTRAINTS_DTO */
-            .owner(USER_1_BRIEF_DTO)
-            .build();
-
-    public static final TableBriefDto TABLE_5_BRIEF_DTO = TableBriefDto.builder()
-            .id(TABLE_5_ID)
-            .databaseId(DATABASE_2_ID)
-            .internalName(TABLE_5_INTERNAL_NAME)
-            .isVersioned(TABLE_5_VERSIONED)
-            .isPublic(TABLE_5_IS_PUBLIC)
-            .isSchemaPublic(TABLE_5_SCHEMA_PUBLIC)
-            .description(TABLE_5_DESCRIPTION)
-            .name(TABLE_5_NAME)
-            .ownedBy(USER_1.getId())
-            .build();
-
-    public static final UUID TABLE_6_ID = UUID.fromString("ae84d169-d36c-4f5a-a390-153d090f9574");
-    public static final String TABLE_6_NAME = "names";
-    public static final String TABLE_6_INTERNALNAME = "names";
-    public static final Boolean TABLE_6_VERSIONED = true;
-    public static final Boolean TABLE_6_IS_PUBLIC = true;
-    public static final Boolean TABLE_6_SCHEMA_PUBLIC = false;
-    public static final Boolean TABLE_6_PROCESSED_CONSTRAINTS = true;
-    public static final String TABLE_6_DESCRIPTION = "Some names dataset";
-    public static final String TABLE_6_QUEUE_NAME = TABLE_6_INTERNALNAME;
-    public static final String TABLE_6_ROUTING_KEY = "dbrepo." + DATABASE_2_ID + "." + TABLE_6_ID;
-    public static final Instant TABLE_6_CREATED = Instant.ofEpochSecond(1677400117L) /* 2023-02-26 08:28:37 (UTC) */;
-    public static final Instant TABLE_6_LAST_MODIFIED = Instant.ofEpochSecond(1677400117L) /* 2023-02-26 08:28:37 (UTC) */;
-
-    public static final Table TABLE_6 = Table.builder()
-            .id(TABLE_6_ID)
-            .tdbid(DATABASE_2_ID)
-            .created(TABLE_6_CREATED)
-            .internalName(TABLE_6_INTERNALNAME)
-            .isVersioned(TABLE_6_VERSIONED)
-            .isPublic(TABLE_6_IS_PUBLIC)
-            .isSchemaPublic(TABLE_6_SCHEMA_PUBLIC)
-            .description(TABLE_6_DESCRIPTION)
-            .name(TABLE_6_NAME)
-            .lastModified(TABLE_6_LAST_MODIFIED)
-            .queueName(TABLE_6_QUEUE_NAME)
-            .columns(new LinkedList<>()) /* TABLE_6_COLUMNS */
-            .constraints(null) /* TABLE_6_CONSTRAINTS */
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .created(TABLE_6_CREATED)
-            .build();
-
-    public static final TableDto TABLE_6_DTO = TableDto.builder()
-            .id(TABLE_6_ID)
-            .databaseId(DATABASE_2_ID)
-            .internalName(TABLE_6_INTERNALNAME)
-            .isVersioned(TABLE_6_VERSIONED)
-            .isPublic(TABLE_6_IS_PUBLIC)
-            .isSchemaPublic(TABLE_6_SCHEMA_PUBLIC)
-            .description(TABLE_6_DESCRIPTION)
-            .name(TABLE_6_NAME)
-            .queueName(TABLE_6_QUEUE_NAME)
-            .routingKey(TABLE_6_ROUTING_KEY)
-            .columns(new LinkedList<>()) /* TABLE_6_COLUMNS_DTO */
-            .constraints(null) /* TABLE_6_CONSTRAINTS_DTO */
-            .owner(USER_1_BRIEF_DTO)
-            .build();
-
-    public static final TableBriefDto TABLE_6_BRIEF_DTO = TableBriefDto.builder()
-            .id(TABLE_6_ID)
-            .databaseId(DATABASE_2_ID)
-            .internalName(TABLE_6_INTERNALNAME)
-            .isVersioned(TABLE_6_VERSIONED)
-            .isPublic(TABLE_6_IS_PUBLIC)
-            .isSchemaPublic(TABLE_6_SCHEMA_PUBLIC)
-            .description(TABLE_6_DESCRIPTION)
-            .name(TABLE_6_NAME)
-            .ownedBy(USER_1.getId())
-            .build();
-
-    public static final UUID TABLE_7_ID = UUID.fromString("e5d10200-3e4f-45f4-9f36-ff3ca39c6c29");
-    public static final String TABLE_7_NAME = "likes";
-    public static final String TABLE_7_INTERNAL_NAME = "likes";
-    public static final Boolean TABLE_7_VERSIONED = true;
-    public static final Boolean TABLE_7_IS_PUBLIC = true;
-    public static final Boolean TABLE_7_SCHEMA_PUBLIC = true;
-    public static final Boolean TABLE_7_PROCESSED_CONSTRAINTS = true;
-    public static final String TABLE_7_DESCRIPTION = "Some likes dataset";
-    public static final String TABLE_7_QUEUE_NAME = TABLE_7_INTERNAL_NAME;
-    public static final String TABLE_7_ROUTING_KEY = "dbrepo." + DATABASE_2_ID + "." + TABLE_7_ID;
-    public static final Instant TABLE_7_CREATED = Instant.ofEpochSecond(1677400147L) /* 2023-02-26 08:29:07 (UTC) */;
-    public static final Instant TABLE_7_LAST_MODIFIED = Instant.ofEpochSecond(1677400147L) /* 2023-02-26 08:29:07 (UTC) */;
-
-    public static final Table TABLE_7 = Table.builder()
-            .id(TABLE_7_ID)
-            .tdbid(DATABASE_2_ID)
-            .created(TABLE_7_CREATED)
-            .internalName(TABLE_7_INTERNAL_NAME)
-            .isVersioned(TABLE_7_VERSIONED)
-            .isPublic(TABLE_7_IS_PUBLIC)
-            .isSchemaPublic(TABLE_7_SCHEMA_PUBLIC)
-            .description(TABLE_7_DESCRIPTION)
-            .name(TABLE_7_NAME)
-            .lastModified(TABLE_7_LAST_MODIFIED)
-            .queueName(TABLE_7_QUEUE_NAME)
-            .columns(new LinkedList<>()) /* TABLE_7_COLUMNS */
-            .constraints(null) /* TABLE_7_CONSTRAINTS */
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .created(TABLE_7_CREATED)
-            .build();
-
-    public static final TableDto TABLE_7_DTO = TableDto.builder()
-            .id(TABLE_7_ID)
-            .databaseId(DATABASE_2_ID)
-            .internalName(TABLE_7_INTERNAL_NAME)
-            .isVersioned(TABLE_7_VERSIONED)
-            .isPublic(TABLE_7_IS_PUBLIC)
-            .isSchemaPublic(TABLE_7_SCHEMA_PUBLIC)
-            .description(TABLE_7_DESCRIPTION)
-            .name(TABLE_7_NAME)
-            .queueName(TABLE_7_QUEUE_NAME)
-            .routingKey(TABLE_7_ROUTING_KEY)
-            .columns(new LinkedList<>()) /* TABLE_7_COLUMNS_DTO */
-            .constraints(null) /* TABLE_7_CONSTRAINTS_DTO */
-            .owner(USER_1_BRIEF_DTO)
-            .build();
-
-    public static final TableBriefDto TABLE_7_BRIEF_DTO = TableBriefDto.builder()
-            .id(TABLE_7_ID)
-            .databaseId(DATABASE_2_ID)
-            .internalName(TABLE_7_INTERNAL_NAME)
-            .isVersioned(TABLE_7_VERSIONED)
-            .isPublic(TABLE_7_IS_PUBLIC)
-            .isSchemaPublic(TABLE_7_SCHEMA_PUBLIC)
-            .description(TABLE_7_DESCRIPTION)
-            .name(TABLE_7_NAME)
-            .ownedBy(USER_1.getId())
-            .build();
-
-    public static final UUID TABLE_4_ID = UUID.fromString("6c87cbcf-5043-404f-9bf1-b09ddbac25a2");
-    public static final String TABLE_4_NAME = "Sensor 2";
-    public static final String TABLE_4_INTERNALNAME = "sensor_2";
-    public static final Boolean TABLE_4_VERSIONED = true;
-    public static final Boolean TABLE_4_IS_PUBLIC = true;
-    public static final Boolean TABLE_4_SCHEMA_PUBLIC = false;
-    public static final String TABLE_4_DESCRIPTION = "Hello sensor";
-    public static final String TABLE_4_QUEUE_NAME = TABLE_4_INTERNALNAME;
-    public static final String TABLE_4_ROUTING_KEY = "dbrepo." + DATABASE_1_ID + "." + TABLE_4_ID;
-    public static final Instant TABLE_4_CREATED = Instant.ofEpochSecond(1677400175L) /* 2023-02-26 08:29:35 (UTC) */;
-    public static final Instant TABLE_4_LAST_MODIFIED = Instant.ofEpochSecond(1677400175L) /* 2023-02-26 08:29:35 (UTC) */;
-    public static final Long TABLE_4_AVG_ROW_LENGTH = 0L;
-    public static final Long TABLE_4_NUM_ROWS = 0L;
-    public static final Long TABLE_4_DATA_LENGTH = 1000L;
-    public static final Long TABLE_4_MAX_DATA_LENGTH = Long.MAX_VALUE;
-
-    public static final Table TABLE_4 = Table.builder()
-            .id(TABLE_4_ID)
-            .tdbid(DATABASE_1_ID)
-            .internalName(TABLE_4_INTERNALNAME)
-            .description(TABLE_4_DESCRIPTION)
-            .database(null /* DATABASE_1 */)
-            .name(TABLE_4_NAME)
-            .queueName(TABLE_4_QUEUE_NAME)
-            .columns(new LinkedList<>()) /* TABLE_4_COLUMNS */
-            .constraints(null) /* TABLE_4_CONSTRAINTS */
-            .isVersioned(TABLE_4_VERSIONED)
-            .isPublic(TABLE_4_IS_PUBLIC)
-            .isSchemaPublic(TABLE_4_SCHEMA_PUBLIC)
-            .owner(USER_1)
-            .ownedBy(USER_1.getId())
-            .created(TABLE_4_CREATED)
-            .lastModified(TABLE_4_LAST_MODIFIED)
-            .avgRowLength(TABLE_4_AVG_ROW_LENGTH)
-            .numRows(TABLE_4_NUM_ROWS)
-            .dataLength(TABLE_4_DATA_LENGTH)
-            .maxDataLength(TABLE_4_MAX_DATA_LENGTH)
-            .build();
-
-    public static final TableDto TABLE_4_DTO = TableDto.builder()
-            .id(TABLE_4_ID)
-            .databaseId(DATABASE_1_ID)
-            .internalName(TABLE_4_INTERNALNAME)
-            .description(TABLE_4_DESCRIPTION)
-            .name(TABLE_4_NAME)
-            .queueName(TABLE_4_QUEUE_NAME)
-            .routingKey(TABLE_4_ROUTING_KEY)
-            .columns(new LinkedList<>()) /* TABLE_4_COLUMNS_DTO */
-            .constraints(null) /* TABLE_4_CONSTRAINTS_DTO */
-            .isVersioned(TABLE_4_VERSIONED)
-            .isPublic(TABLE_4_IS_PUBLIC)
-            .isSchemaPublic(TABLE_4_SCHEMA_PUBLIC)
-            .owner(USER_1_BRIEF_DTO)
-            .avgRowLength(TABLE_4_AVG_ROW_LENGTH)
-            .numRows(TABLE_4_NUM_ROWS)
-            .dataLength(TABLE_4_DATA_LENGTH)
-            .maxDataLength(TABLE_4_MAX_DATA_LENGTH)
-            .build();
-
-    public static final TableBriefDto TABLE_4_BRIEF_DTO = TableBriefDto.builder()
-            .id(TABLE_4_ID)
-            .databaseId(DATABASE_1_ID)
-            .internalName(TABLE_4_INTERNALNAME)
-            .description(TABLE_4_DESCRIPTION)
-            .name(TABLE_4_NAME)
-            .isVersioned(TABLE_4_VERSIONED)
-            .isPublic(TABLE_4_IS_PUBLIC)
-            .isSchemaPublic(TABLE_4_SCHEMA_PUBLIC)
-            .ownedBy(USER_1.getId())
-            .build();
-
-    public static final ColumnBriefDto TABLE_4_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
-            .id(UUID.fromString("360f02be-6dfb-48ea-9d1e-1da488b0e324"))
-            .name("Timestamp")
-            .internalName("timestamp")
-            .columnType(ColumnTypeDto.TIMESTAMP)
-            .build();
-
-    public static final UUID COLUMN_4_1_ID = UUID.fromString("c8ec8a56-dea1-4316-895f-56e6d289cbf7");
-
-    public static final UUID COLUMN_4_2_ID = UUID.fromString("d06956ae-aabd-474f-a47d-47af1ba043d1");
-
-    public static final List<TableColumn> TABLE_4_COLUMNS = List.of(TableColumn.builder()
-                    .id(COLUMN_4_1_ID)
-                    .ordinalPosition(0)
-                    .table(TABLE_4)
-                    .name("Timestamp")
-                    .internalName("timestamp")
-                    .columnType(TableColumnType.TIMESTAMP)
-                    .isNullAllowed(false)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_4_2_ID)
-                    .ordinalPosition(1)
-                    .table(TABLE_4)
-                    .name("Value")
-                    .internalName("value")
-                    .columnType(TableColumnType.DECIMAL)
-                    .isNullAllowed(true)
-                    .build());
-
-    public static final List<CreateTableColumnDto> TABLE_4_COLUMNS_CREATE_DTO = List.of(CreateTableColumnDto.builder()
-                    .name("Timestamp")
-                    .type(ColumnTypeDto.TIMESTAMP)
-                    .nullAllowed(false)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Value")
-                    .type(ColumnTypeDto.DECIMAL)
-                    .nullAllowed(true)
-                    .size(10L)
-                    .d(10L)
-                    .build());
-
-    public static final CreateTableConstraintsDto TABLE_4_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
-            .checks(new LinkedHashSet<>())
-            .primaryKey(new LinkedHashSet<>(Set.of("Timestamp")))
-            .foreignKeys(new LinkedList<>())
-            .uniques(new LinkedList<>(List.of(List.of("Timestamp"))))
-            .build();
-
-    public static final CreateTableDto TABLE_4_CREATE_DTO = CreateTableDto.builder()
-            .name(TABLE_4_NAME)
-            .description(TABLE_4_DESCRIPTION)
-            .columns(TABLE_4_COLUMNS_CREATE_DTO)
-            .constraints(TABLE_4_CONSTRAINTS_CREATE_DTO)
-            .build();
-
-    public static final at.ac.tuwien.ifs.dbrepo.core.api.database.table.internal.TableCreateDto TABLE_4_CREATE_INTERNAL_DTO = at.ac.tuwien.ifs.dbrepo.core.api.database.table.internal.TableCreateDto.builder()
-            .name(TABLE_4_NAME)
-            .description(TABLE_4_DESCRIPTION)
-            .columns(TABLE_4_COLUMNS_CREATE_DTO)
-            .constraints(TABLE_4_CONSTRAINTS_CREATE_DTO)
-            .build();
-
-    public static final List<ColumnDto> TABLE_4_COLUMNS_DTO = List.of(ColumnDto.builder()
-                    .id(COLUMN_4_1_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .tableId(TABLE_4_ID)
-                    .name("Timestamp")
-                    .internalName("timestamp")
-                    .columnType(ColumnTypeDto.TIMESTAMP)
-                    .isNullAllowed(false)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_4_2_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .tableId(TABLE_4_ID)
-                    .name("Value")
-                    .internalName("value")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .isNullAllowed(true)
-                    .build());
-
-    public static final UUID TABLE_8_ID = UUID.fromString("2e039d0d-3257-4083-8b32-76d7cfa1f7fd");
-    public static final String TABLE_8_NAME = "location";
-    public static final String TABLE_8_INTERNAL_NAME = "mfcc";
-    public static final Boolean TABLE_8_VERSIONED = true;
-    public static final Boolean TABLE_8_IS_PUBLIC = false;
-    public static final Boolean TABLE_8_SCHEMA_PUBLIC = false;
-    public static final String TABLE_8_DESCRIPTION = "Hello mfcc";
-    public static final String TABLE_8_QUEUE_NAME = TABLE_8_INTERNAL_NAME;
-    public static final String TABLE_8_ROUTING_KEY = "dbrepo." + DATABASE_3_ID + "." + TABLE_8_ID;
-    public static final Instant TABLE_8_CREATED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
-    public static final Instant TABLE_8_LAST_MODIFIED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
-
-    public static final Table TABLE_8 = Table.builder()
-            .id(TABLE_8_ID)
-            .tdbid(DATABASE_3_ID)
-            .internalName(TABLE_8_INTERNAL_NAME)
-            .description(TABLE_8_DESCRIPTION)
-            .isVersioned(TABLE_8_VERSIONED)
-            .isPublic(TABLE_8_IS_PUBLIC)
-            .isSchemaPublic(TABLE_8_SCHEMA_PUBLIC)
-            .database(null /* DATABASE_1 */)
-            .name(TABLE_8_NAME)
-            .queueName(TABLE_8_QUEUE_NAME)
-            .columns(new LinkedList<>()) /* TABLE_8_COLUMNS */
-            .constraints(null) /* TABLE_8_CONSTRAINTS */
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .created(TABLE_8_CREATED)
-            .lastModified(TABLE_8_LAST_MODIFIED)
-            .build();
-
-    public static final TableDto TABLE_8_DTO = TableDto.builder()
-            .id(TABLE_8_ID)
-            .databaseId(DATABASE_3_ID)
-            .internalName(TABLE_8_INTERNAL_NAME)
-            .description(TABLE_8_DESCRIPTION)
-            .isVersioned(TABLE_8_VERSIONED)
-            .isPublic(TABLE_8_IS_PUBLIC)
-            .isSchemaPublic(TABLE_8_SCHEMA_PUBLIC)
-            .name(TABLE_8_NAME)
-            .queueName(TABLE_8_QUEUE_NAME)
-            .columns(new LinkedList<>()) /* TABLE_8_COLUMNS_DTO */
-            .constraints(null) /* TABLE_8_CONSTRAINTS_DTO */
-            .owner(USER_1_BRIEF_DTO)
-            .build();
-
-    public static final TableUpdateDto TABLE_8_UPDATE_DTO = TableUpdateDto.builder()
-            .description(null)
-            .isPublic(true)
-            .isSchemaPublic(true)
-            .build();
-
-    public static final TableBriefDto TABLE_8_BRIEF_DTO = TableBriefDto.builder()
-            .id(TABLE_8_ID)
-            .databaseId(DATABASE_3_ID)
-            .internalName(TABLE_8_INTERNAL_NAME)
-            .description(TABLE_8_DESCRIPTION)
-            .isVersioned(TABLE_8_VERSIONED)
-            .isPublic(TABLE_8_IS_PUBLIC)
-            .isSchemaPublic(TABLE_8_SCHEMA_PUBLIC)
-            .name(TABLE_8_NAME)
-            .ownedBy(USER_1.getId())
-            .build();
-
-    public static final UUID TABLE_9_ID = UUID.fromString("9314294f-04fc-4354-8b1f-2a8aeb566453");
-    public static final String TABLE_9_NAME = "Weather Location";
-    public static final String TABLE_9_INTERNAL_NAME = "weather_location";
-    public static final Boolean TABLE_9_VERSIONED = true;
-    public static final Boolean TABLE_9_IS_PUBLIC = false;
-    public static final Boolean TABLE_9_SCHEMA_PUBLIC = true;
-    public static final Boolean TABLE_9_PROCESSED_CONSTRAINTS = true;
-    public static final String TABLE_9_DESCRIPTION = "Location";
-    public static final String TABLE_9_QUEUE_NAME = TABLE_9_INTERNAL_NAME;
-    public static final String TABLE_9_ROUTING_KEY = "dbrepo." + DATABASE_4_ID + "." + TABLE_9_ID;
-    public static final Instant TABLE_9_CREATED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
-    public static final Instant TABLE_9_LAST_MODIFIED = Instant.ofEpochSecond(1688400185L) /* 2023-02-26 08:29:35 (UTC) */;
-
-    public static final Table TABLE_9 = Table.builder()
-            .id(TABLE_9_ID)
-            .tdbid(DATABASE_4_ID)
-            .internalName(TABLE_9_INTERNAL_NAME)
-            .description(TABLE_9_DESCRIPTION)
-            .isVersioned(TABLE_9_VERSIONED)
-            .isPublic(TABLE_9_IS_PUBLIC)
-            .isSchemaPublic(TABLE_9_SCHEMA_PUBLIC)
-            .database(null /* DATABASE_1 */)
-            .name(TABLE_9_NAME)
-            .queueName(TABLE_9_QUEUE_NAME)
-            .columns(new LinkedList<>()) /* TABLE_9_COLUMNS */
-            .constraints(null) /* TABLE_9_CONSTRAINTS */
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .created(TABLE_9_CREATED)
-            .lastModified(TABLE_9_LAST_MODIFIED)
-            .build();
-
-    public static final TableDto TABLE_9_DTO = TableDto.builder()
-            .id(TABLE_9_ID)
-            .databaseId(DATABASE_4_ID)
-            .internalName(TABLE_9_INTERNAL_NAME)
-            .description(TABLE_9_DESCRIPTION)
-            .isVersioned(TABLE_9_VERSIONED)
-            .isPublic(TABLE_9_IS_PUBLIC)
-            .isSchemaPublic(TABLE_9_SCHEMA_PUBLIC)
-            .name(TABLE_9_NAME)
-            .queueName(TABLE_9_QUEUE_NAME)
-            .columns(new LinkedList<>()) /* TABLE_9_COLUMNS_DTO */
-            .constraints(null) /* TABLE_9_CONSTRAINTS_DTO */
-            .owner(USER_1_BRIEF_DTO)
-            .build();
-
-    public static final TableBriefDto TABLE_9_BRIEF_DTO = TableBriefDto.builder()
-            .id(TABLE_9_ID)
-            .databaseId(DATABASE_4_ID)
-            .internalName(TABLE_9_INTERNAL_NAME)
-            .description(TABLE_9_DESCRIPTION)
-            .isVersioned(TABLE_9_VERSIONED)
-            .isPublic(TABLE_9_IS_PUBLIC)
-            .isSchemaPublic(TABLE_9_SCHEMA_PUBLIC)
-            .name(TABLE_9_NAME)
-            .ownedBy(USER_1.getId())
-            .build();
-
-    public static final UUID COLUMN_9_1_ID = UUID.fromString("e03c7578-2d1a-4599-9b11-7174f40efc0a");
-    public static final String COLUMN_9_1_NAME = "location";
-    public static final String COLUMN_9_1_INTERNAL_NAME = "location";
-
-    public static final ColumnBriefDto TABLE_9_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
-            .id(COLUMN_9_1_ID)
-            .name(COLUMN_9_1_NAME)
-            .internalName(COLUMN_9_1_INTERNAL_NAME)
-            .columnType(ColumnTypeDto.BIGINT)
-            .build();
-
-    public static final UUID COLUMN_9_2_ID = UUID.fromString("03c07223-17e1-4af5-b1ae-ef9ab434fe2d");
-
-    public static final UUID COLUMN_9_3_ID = UUID.fromString("ee6590db-923b-4234-beb8-3120da055cf6");
-
-    public static final List<TableColumn> TABLE_9_COLUMNS = List.of(TableColumn.builder()
-                    .id(COLUMN_9_1_ID)
-                    .ordinalPosition(0)
-                    .table(TABLE_9)
-                    .name(COLUMN_9_1_NAME)
-                    .internalName(COLUMN_9_1_INTERNAL_NAME)
-                    .columnType(TableColumnType.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(false)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_9_2_ID)
-                    .ordinalPosition(1)
-                    .table(TABLE_9)
-                    .name("lat")
-                    .internalName("lat")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_9_3_ID)
-                    .ordinalPosition(2)
-                    .table(TABLE_9)
-                    .name("lng")
-                    .internalName("lng")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build());
-
-    public static final List<ColumnDto> TABLE_9_COLUMNS_DTO = List.of(ColumnDto.builder()
-                    .id(COLUMN_9_1_ID)
-                    .ordinalPosition(0)
-                    .name(COLUMN_9_1_NAME)
-                    .internalName(COLUMN_9_1_INTERNAL_NAME)
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(false)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_9_2_ID)
-                    .ordinalPosition(1)
-                    .name("lat")
-                    .internalName("lat")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_9_3_ID)
-                    .ordinalPosition(2)
-                    .name("lng")
-                    .internalName("lng")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build());
-
-    public static final Constraints TABLE_9_CONSTRAINTS = Constraints.builder()
-            .checks(new LinkedHashSet<>())
-            .foreignKeys(new LinkedList<>())
-            .uniques(new LinkedList<>())
-            .primaryKey(new LinkedList<>(List.of(PrimaryKey.builder()
-                    .table(TABLE_9)
-                    .column(TABLE_9_COLUMNS.get(0))
-                    .id(COLUMN_9_1_ID)
-                    .build())))
-            .build();
-
-    public static final ConstraintsDto TABLE_9_CONSTRAINTS_DTO = ConstraintsDto.builder()
-            .checks(new LinkedHashSet<>())
-            .foreignKeys(new LinkedList<>())
-            .uniques(new LinkedList<>())
-            .primaryKey(new LinkedHashSet<>(Set.of(PrimaryKeyDto.builder()
-                    .table(TABLE_9_BRIEF_DTO)
-                    .column(TABLE_9_COLUMNS_BRIEF_0_DTO)
-                    .id(COLUMN_9_1_ID)
-                    .build())))
-            .build();
-
-    public static final UUID QUERY_9_ID = UUID.fromString("df34f0b9-b64c-406c-9109-7a031f4a7f27");
-    public static final String QUERY_9_STATEMENT = "SELECT `lat`, `lng` FROM `mfcc` WHERE `location` = 'Fuji'";
-    public static final String QUERY_9_QUERY_HASH = "dfcdec827b2ea74d89415f8d1ce39354f59ef304444ba4e12e4f3d9d3f35abe3";
-    public static final String QUERY_9_RESULT_HASH = "f0aba070a1fd29e96230d12d7c0b4d08b89820b3cc2dda0575680492010016e7";
-    public static final Instant QUERY_9_CREATED = Instant.now().minus(5, MINUTES);
-    public static final Instant QUERY_9_EXECUTION = Instant.now().minus(1, MINUTES);
-    public static final Instant QUERY_9_LAST_MODIFIED = Instant.ofEpochSecond(1551588555L);
-    public static final Long QUERY_9_RESULT_NUMBER = 6L;
-    public static final Boolean QUERY_9_PERSISTED = true;
-
     public static final SubsetDto QUERY_9_SUBSET_DTO = SubsetDto.builder()
-            .tableId(TABLE_9_ID)
+            .tableId(TABLE_9.getId())
             .columns(new LinkedList<>(List.of(COLUMN_9_2_ID, COLUMN_9_3_ID)))
             .filter(new LinkedList<>(List.of(FilterDto.builder()
                     .columnId(COLUMN_9_1_ID)
@@ -2134,225 +717,6 @@ public class BaseTest {
             .type(QUEUE_TYPE)
             .build();
 
-    public static final UUID ONTOLOGY_1_ID = UUID.fromString("dc195d01-0a45-4583-aa83-fd270b874353");
-    public static final String ONTOLOGY_1_PREFIX = "om2";
-    public static final String ONTOLOGY_1_NEW_PREFIX = "om-2";
-    public static final String ONTOLOGY_1_URI = "http://www.ontology-of-units-of-measure.org/resource/om-2/";
-    public static final String ONTOLOGY_1_URI_PATTERN = "http://www.ontology-of-units-of-measure.org/resource/om-2/.*";
-    public static final String ONTOLOGY_1_SPARQL_ENDPOINT = null;
-    public static final Boolean ONTOLOGY_1_SPARQL = false;
-    public static final String ONTOLOGY_1_RDF_PATH = "rdf/om-2.0.rdf";
-    public static final Boolean ONTOLOGY_1_RDF = true;
-    public static final UUID ONTOLOGY_1_CREATED_BY = USER_1.getId();
-
-    public static final Ontology ONTOLOGY_1 = Ontology.builder()
-            .id(ONTOLOGY_1_ID)
-            .prefix(ONTOLOGY_1_PREFIX)
-            .uri(ONTOLOGY_1_URI)
-            .uriPattern(ONTOLOGY_1_URI_PATTERN)
-            .sparqlEndpoint(ONTOLOGY_1_SPARQL_ENDPOINT)
-            .rdfPath(ONTOLOGY_1_RDF_PATH)
-            .build();
-
-    public static final OntologyDto ONTOLOGY_1_DTO = OntologyDto.builder()
-            .id(ONTOLOGY_1_ID)
-            .prefix(ONTOLOGY_1_PREFIX)
-            .uri(ONTOLOGY_1_URI)
-            .uriPattern(ONTOLOGY_1_URI_PATTERN)
-            .sparqlEndpoint(ONTOLOGY_1_SPARQL_ENDPOINT)
-            .sparql(ONTOLOGY_1_SPARQL)
-            .rdfPath(ONTOLOGY_1_RDF_PATH)
-            .rdf(ONTOLOGY_1_RDF)
-            .build();
-
-    public static final OntologyBriefDto ONTOLOGY_1_BRIEF_DTO = OntologyBriefDto.builder()
-            .id(ONTOLOGY_1_ID)
-            .prefix(ONTOLOGY_1_PREFIX)
-            .uri(ONTOLOGY_1_URI)
-            .uriPattern(ONTOLOGY_1_URI_PATTERN)
-            .sparql(ONTOLOGY_1_SPARQL)
-            .rdf(ONTOLOGY_1_RDF)
-            .build();
-
-    public static final OntologyCreateDto ONTOLOGY_1_CREATE_DTO = OntologyCreateDto.builder()
-            .prefix(ONTOLOGY_1_PREFIX)
-            .uri(ONTOLOGY_1_URI)
-            .sparqlEndpoint(ONTOLOGY_1_SPARQL_ENDPOINT)
-            .build();
-
-    public static final OntologyModifyDto ONTOLOGY_1_MODIFY_DTO = OntologyModifyDto.builder()
-            .prefix(ONTOLOGY_1_NEW_PREFIX)
-            .uri(ONTOLOGY_1_URI)
-            .sparqlEndpoint(ONTOLOGY_1_SPARQL_ENDPOINT)
-            .build();
-
-    public static final UUID ONTOLOGY_2_ID = UUID.fromString("41d902a1-f9f8-4d51-ad64-618b72acf5ed");
-    public static final String ONTOLOGY_2_PREFIX = "wd";
-    public static final String ONTOLOGY_2_URI = "http://www.wikidata.org/";
-    public static final String ONTOLOGY_2_SPARQL_ENDPOINT = "https://query.wikidata.org/sparql";
-    public static final UUID ONTOLOGY_2_CREATED_BY = USER_1.getId();
-
-    public static final Ontology ONTOLOGY_2 = Ontology.builder()
-            .id(ONTOLOGY_2_ID)
-            .prefix(ONTOLOGY_2_PREFIX)
-            .uri(ONTOLOGY_2_URI)
-            .sparqlEndpoint(ONTOLOGY_2_SPARQL_ENDPOINT)
-            .build();
-
-    public static final OntologyCreateDto ONTOLOGY_2_CREATE_DTO = OntologyCreateDto.builder()
-            .prefix(ONTOLOGY_2_PREFIX)
-            .uri(ONTOLOGY_2_URI)
-            .sparqlEndpoint(ONTOLOGY_2_SPARQL_ENDPOINT)
-            .build();
-
-    public static final UUID ONTOLOGY_3_ID = UUID.fromString("5b41390b-d2d2-45c6-8038-1258c4b2725f");
-    public static final String ONTOLOGY_3_PREFIX = "rdfs";
-    public static final String ONTOLOGY_3_URI = "http://www.w3.org/2000/01/rdf-schema#";
-    public static final String ONTOLOGY_3_SPARQL_ENDPOINT = null;
-    public static final UUID ONTOLOGY_3_CREATED_BY = USER_1.getId();
-
-    public static final Ontology ONTOLOGY_3 = Ontology.builder()
-            .id(ONTOLOGY_3_ID)
-            .prefix(ONTOLOGY_3_PREFIX)
-            .uri(ONTOLOGY_3_URI)
-            .sparqlEndpoint(ONTOLOGY_3_SPARQL_ENDPOINT)
-            .build();
-
-    public static final OntologyCreateDto ONTOLOGY_3_CREATE_DTO = OntologyCreateDto.builder()
-            .prefix(ONTOLOGY_3_PREFIX)
-            .uri(ONTOLOGY_3_URI)
-            .sparqlEndpoint(ONTOLOGY_3_SPARQL_ENDPOINT)
-            .build();
-
-    public static final UUID ONTOLOGY_4_ID = UUID.fromString("d6992475-9b71-4a4a-a6eb-bc1fe6a34443");
-    public static final String ONTOLOGY_4_PREFIX = "schema";
-    public static final String ONTOLOGY_4_URI = "http://schema.org/";
-    public static final String ONTOLOGY_4_SPARQL_ENDPOINT = null;
-    public static final UUID ONTOLOGY_4_CREATED_BY = USER_1.getId();
-
-    public static final Ontology ONTOLOGY_4 = Ontology.builder()
-            .id(ONTOLOGY_4_ID)
-            .prefix(ONTOLOGY_4_PREFIX)
-            .uri(ONTOLOGY_4_URI)
-            .sparqlEndpoint(ONTOLOGY_4_SPARQL_ENDPOINT)
-            .build();
-
-    public static final OntologyCreateDto ONTOLOGY_4_CREATE_DTO = OntologyCreateDto.builder()
-            .prefix(ONTOLOGY_4_PREFIX)
-            .uri(ONTOLOGY_4_URI)
-            .sparqlEndpoint(ONTOLOGY_4_SPARQL_ENDPOINT)
-            .build();
-
-    public static final UUID ONTOLOGY_5_ID = UUID.fromString("f95d1330-762e-4f5a-875a-3c64da5808a1");
-    public static final String ONTOLOGY_5_PREFIX = "db";
-    public static final String ONTOLOGY_5_URI = "http://dbpedia.org";
-    public static final String ONTOLOGY_5_SPARQL_ENDPOINT = "http://dbpedia.org/sparql";
-    public static final UUID ONTOLOGY_5_CREATED_BY = USER_1.getId();
-
-    public static final Ontology ONTOLOGY_5 = Ontology.builder()
-            .id(ONTOLOGY_5_ID)
-            .prefix(ONTOLOGY_5_PREFIX)
-            .uri(ONTOLOGY_5_URI)
-            .sparqlEndpoint(ONTOLOGY_5_SPARQL_ENDPOINT)
-            .build();
-
-    public static final OntologyCreateDto ONTOLOGY_5_CREATE_DTO = OntologyCreateDto.builder()
-            .prefix(ONTOLOGY_5_PREFIX)
-            .uri(ONTOLOGY_5_URI)
-            .sparqlEndpoint(ONTOLOGY_5_SPARQL_ENDPOINT)
-            .build();
-
-    public static final UUID COLUMN_8_1_ID = UUID.fromString("af362ac6-5dbb-4ede-83ea-5d94b39641c8");
-    public static final Integer COLUMN_8_1_ORDINALPOS = 0;
-    public static final String COLUMN_8_1_NAME = "ID";
-    public static final String COLUMN_8_1_INTERNAL_NAME = "id";
-    public static final TableColumnType COLUMN_8_1_TYPE = TableColumnType.BIGINT;
-    public static final ColumnTypeDto COLUMN_8_1_TYPE_DTO = ColumnTypeDto.BIGINT;
-    public static final Boolean COLUMN_8_1_NULL = false;
-    public static final Boolean COLUMN_8_1_AUTO_GENERATED = true;
-
-    public static final UUID COLUMN_8_2_ID = UUID.fromString("7ada597b-0766-4612-9ace-67eeee94e2da");
-    public static final Integer COLUMN_8_2_ORDINALPOS = 1;
-    public static final String COLUMN_8_2_NAME = "Value";
-    public static final String COLUMN_8_2_INTERNAL_NAME = "value";
-    public static final TableColumnType COLUMN_8_2_TYPE = TableColumnType.DECIMAL;
-    public static final ColumnTypeDto COLUMN_8_2_TYPE_DTO = ColumnTypeDto.DECIMAL;
-    public static final Long COLUMN_8_2_SIZE = 10L;
-    public static final Long COLUMN_8_2_D = 10L;
-    public static final Boolean COLUMN_8_2_NULL = false;
-    public static final Boolean COLUMN_8_2_AUTO_GENERATED = false;
-
-    public static final UUID COLUMN_8_3_ID = UUID.fromString("8bcd9ef8-f7b8-4730-acc1-a3d43ba69a56");
-    public static final Integer COLUMN_8_3_ORDINALPOS = 2;
-    public static final String COLUMN_8_3_NAME = "raw";
-    public static final String COLUMN_8_3_INTERNAL_NAME = "raw";
-    public static final TableColumnType COLUMN_8_3_TYPE = TableColumnType.LONGBLOB;
-    public static final ColumnTypeDto COLUMN_8_3_TYPE_DTO = ColumnTypeDto.LONGBLOB;
-    public static final Boolean COLUMN_8_3_NULL = true;
-    public static final Boolean COLUMN_8_3_AUTO_GENERATED = false;
-
-    public static final ColumnBriefDto TABLE_8_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
-            .id(COLUMN_8_1_ID)
-            .name(COLUMN_8_1_NAME)
-            .internalName(COLUMN_8_1_INTERNAL_NAME)
-            .columnType(ColumnTypeDto.BIGINT)
-            .build();
-
-    public static final List<TableColumn> TABLE_8_COLUMNS = List.of(TableColumn.builder()
-                    .id(COLUMN_8_1_ID)
-                    .ordinalPosition(COLUMN_8_1_ORDINALPOS)
-                    .table(TABLE_8)
-                    .name(COLUMN_8_1_NAME)
-                    .internalName(COLUMN_8_1_INTERNAL_NAME)
-                    .columnType(COLUMN_8_1_TYPE)
-                    .isNullAllowed(COLUMN_8_1_NULL)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_8_2_ID)
-                    .ordinalPosition(COLUMN_8_2_ORDINALPOS)
-                    .table(TABLE_8)
-                    .name(COLUMN_8_2_NAME)
-                    .internalName(COLUMN_8_2_INTERNAL_NAME)
-                    .columnType(COLUMN_8_2_TYPE)
-                    .isNullAllowed(COLUMN_8_2_NULL)
-                    .size(COLUMN_8_2_SIZE)
-                    .d(COLUMN_8_2_D)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_8_3_ID)
-                    .ordinalPosition(COLUMN_8_3_ORDINALPOS)
-                    .table(TABLE_8)
-                    .name(COLUMN_8_3_NAME)
-                    .internalName(COLUMN_8_3_INTERNAL_NAME)
-                    .columnType(COLUMN_8_3_TYPE)
-                    .isNullAllowed(COLUMN_8_3_NULL)
-                    .build());
-
-    public static final List<ColumnDto> TABLE_8_COLUMNS_DTO = List.of(ColumnDto.builder()
-                    .id(COLUMN_8_1_ID)
-                    .ordinalPosition(COLUMN_8_1_ORDINALPOS)
-                    .name(COLUMN_8_1_NAME)
-                    .internalName(COLUMN_8_1_INTERNAL_NAME)
-                    .columnType(COLUMN_8_1_TYPE_DTO)
-                    .isNullAllowed(COLUMN_8_1_NULL)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_8_2_ID)
-                    .ordinalPosition(COLUMN_8_2_ORDINALPOS)
-                    .name(COLUMN_8_2_NAME)
-                    .internalName(COLUMN_8_2_INTERNAL_NAME)
-                    .columnType(COLUMN_8_2_TYPE_DTO)
-                    .isNullAllowed(COLUMN_8_2_NULL)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_8_3_ID)
-                    .ordinalPosition(COLUMN_8_3_ORDINALPOS)
-                    .name(COLUMN_8_3_NAME)
-                    .internalName(COLUMN_8_3_INTERNAL_NAME)
-                    .columnType(COLUMN_8_3_TYPE_DTO)
-                    .isNullAllowed(COLUMN_8_3_NULL)
-                    .build());
-
     public static final Long TABLE_8_DATA_COUNT = 6L;
     @SuppressWarnings("java:S3599")
     public static final List<Map<String, Object>> TABLE_8_DATA_DTO = new LinkedList<>(List.of(
@@ -2400,32 +764,6 @@ public class BaseTest {
                     .build())))
             .build();
 
-    public static final ViewDto QUERY_1_VIEW_DTO = ViewDto.builder()
-            .query(QUERY_1_DTO.getQuery())
-            .queryHash(QUERY_1_DTO.getQueryHash())
-            .owner(USER_1_BRIEF_DTO)
-            .columns(new LinkedList<>(List.of(ViewColumnDto.builder()
-                            .name("id")
-                            .internalName("id")
-                            .build(),
-                    ViewColumnDto.builder()
-                            .name("date")
-                            .internalName("date")
-                            .build(),
-                    ViewColumnDto.builder()
-                            .name("location")
-                            .internalName("location")
-                            .build(),
-                    ViewColumnDto.builder()
-                            .name("mintemp")
-                            .internalName("mintemp")
-                            .build(),
-                    ViewColumnDto.builder()
-                            .name("rainfall")
-                            .internalName("rainfall")
-                            .build())))
-            .build();
-
     public static final List<Map<String, Object>> QUERY_4_RESULT_DTO = new LinkedList<>(List.of(
             new HashMap<>() {{
                 put("id", BigInteger.valueOf(1L));
@@ -2447,31 +785,6 @@ public class BaseTest {
                 put("value", 23.1);
             }}));
 
-    public static final SubsetDto QUERY_5_SUBSET_DTO = SubsetDto.builder()
-            .tableId(TABLE_8_ID)
-            .columns(new LinkedList<>(List.of(COLUMN_8_1_ID, COLUMN_8_2_ID)))
-            .filter(new LinkedList<>(List.of(FilterDto.builder()
-                    .columnId(COLUMN_8_2_ID)
-                    .operatorId(IMAGE_1_OPERATORS_2_ID)
-                    .value("0")
-                    .type(FilterTypeDto.WHERE)
-                    .build())))
-            .build();
-
-    public static final ViewDto QUERY_5_VIEW_DTO = ViewDto.builder()
-            .query(QUERY_5_DTO.getQuery())
-            .queryHash(QUERY_5_DTO.getQueryHash())
-            .owner(USER_1_BRIEF_DTO)
-            .columns(new LinkedList<>(List.of(ViewColumnDto.builder()
-                            .name("id")
-                            .internalName("id")
-                            .build(),
-                    ViewColumnDto.builder()
-                            .name("value")
-                            .internalName("value")
-                            .build())))
-            .build();
-
     public static final List<Map<String, Object>> QUERY_5_RESULT_DTO = new LinkedList<>(List.of(
             Map.of("id", BigInteger.valueOf(1L), "value", 11.2),
             Map.of("id", BigInteger.valueOf(2L), "value", 11.3),
@@ -2481,1997 +794,6 @@ public class BaseTest {
             Map.of("id", BigInteger.valueOf(6L), "value", 23.1)
     ));
 
-    public static final List<TableColumn> TABLE_1_COLUMNS = List.of(TableColumn.builder()
-                    .id(COLUMN_1_1_ID)
-                    .ordinalPosition(0)
-                    .table(TABLE_1)
-                    .name("id")
-                    .internalName("id")
-                    .columnType(TableColumnType.SERIAL)
-                    .isNullAllowed(false)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_1_2_ID)
-                    .ordinalPosition(1)
-                    .table(TABLE_1)
-                    .name("Date")
-                    .internalName("date")
-                    .columnType(TableColumnType.DATE)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_1_3_ID)
-                    .ordinalPosition(2)
-                    .table(TABLE_1)
-                    .name("Location")
-                    .internalName("location")
-                    .columnType(TableColumnType.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_1_4_ID)
-                    .ordinalPosition(3)
-                    .table(TABLE_1)
-                    .name("MinTemp")
-                    .internalName("mintemp")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_1_5_ID)
-                    .ordinalPosition(4)
-                    .table(TABLE_1)
-                    .name("Rainfall")
-                    .internalName("rainfall")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .concept(CONCEPT_1)
-                    .unit(UNIT_1)
-                    .isNullAllowed(true)
-                    .build());
-
-    public static final ColumnBriefDto TABLE_1_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
-            .id(COLUMN_1_1_ID)
-            .name("id")
-            .internalName("id")
-            .columnType(ColumnTypeDto.BIGINT)
-            .build();
-
-    public static final List<CreateTableColumnDto> TABLE_1_COLUMNS_CREATE_DTO = List.of(CreateTableColumnDto.builder()
-                    .name("id")
-                    .type(ColumnTypeDto.BIGINT)
-                    .nullAllowed(false)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Date")
-                    .type(ColumnTypeDto.DATE)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Location")
-                    .type(ColumnTypeDto.VARCHAR)
-                    .size(255L)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("MinTemp")
-                    .type(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Rainfall")
-                    .type(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .nullAllowed(true)
-                    .conceptUri(CONCEPT_1.getUri())
-                    .unitUri(UNIT_1.getUri())
-                    .build());
-
-    public static final CreateTableConstraintsDto TABLE_1_CONSTRAINTS_CREATE_DTO = CreateTableConstraintsDto.builder()
-            .checks(new LinkedHashSet<>())
-            .primaryKey(new LinkedHashSet<>(List.of("id")))
-            .foreignKeys(new LinkedList<>())
-            .uniques(new LinkedList<>(List.of(List.of("date"))))
-            .build();
-
-    public static final CreateTableConstraintsDto TABLE_1_CONSTRAINTS_CREATE_INVALID_DTO = CreateTableConstraintsDto.builder()
-            .checks(new LinkedHashSet<>())
-            .primaryKey(new LinkedHashSet<>())
-            .foreignKeys(new LinkedList<>())
-            .uniques(new LinkedList<>(List.of(List.of("date"))))
-            .build();
-
-    public static final CreateTableDto TABLE_1_CREATE_DTO = CreateTableDto.builder()
-            .name(TABLE_1_NAME)
-            .description(TABLE_1_DESCRIPTION)
-            .columns(TABLE_1_COLUMNS_CREATE_DTO)
-            .constraints(TABLE_1_CONSTRAINTS_CREATE_DTO)
-            .build();
-
-    public static final at.ac.tuwien.ifs.dbrepo.core.api.database.table.internal.TableCreateDto TABLE_1_CREATE_INTERNAL_DTO = at.ac.tuwien.ifs.dbrepo.core.api.database.table.internal.TableCreateDto.builder()
-            .name(TABLE_1_NAME)
-            .description(TABLE_1_DESCRIPTION)
-            .columns(TABLE_1_COLUMNS_CREATE_DTO)
-            .constraints(TABLE_1_CONSTRAINTS_CREATE_DTO)
-            .build();
-
-    public static final at.ac.tuwien.ifs.dbrepo.core.api.database.table.internal.TableCreateDto TABLE_1_CREATE_INTERNAL_INVALID_DTO = at.ac.tuwien.ifs.dbrepo.core.api.database.table.internal.TableCreateDto.builder()
-            .name(TABLE_1_NAME)
-            .description(TABLE_1_DESCRIPTION)
-            .columns(TABLE_1_COLUMNS_CREATE_DTO)
-            .constraints(TABLE_1_CONSTRAINTS_CREATE_INVALID_DTO)
-            .build();
-
-    public static final UUID COLUMN_2_1_ID = UUID.fromString("795faa78-7ebb-4dd5-9eb1-e54a9192d0b5");
-
-    public static final UUID COLUMN_2_2_ID = UUID.fromString("f316ced5-7774-4656-aa7f-a874622d99b3");
-
-    public static final UUID COLUMN_2_3_ID = UUID.fromString("11cb1aa2-8582-45ef-a3bb-7056aa94cdf1");
-
-    public static final List<TableColumn> TABLE_2_COLUMNS = List.of(TableColumn.builder()
-                    .id(COLUMN_2_1_ID)
-                    .ordinalPosition(0)
-                    .table(TABLE_2)
-                    .name("location")
-                    .internalName("location")
-                    .columnType(TableColumnType.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(false)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_2_2_ID)
-                    .ordinalPosition(1)
-                    .table(TABLE_2)
-                    .name("lat")
-                    .internalName("lat")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_2_3_ID)
-                    .ordinalPosition(2)
-                    .table(TABLE_2)
-                    .name("lng")
-                    .internalName("lng")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build());
-
-    public static final ColumnBriefDto TABLE_2_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
-            .id(COLUMN_2_1_ID)
-            .name("location")
-            .internalName("location")
-            .columnType(ColumnTypeDto.VARCHAR)
-            .build();
-
-    public static final ColumnBriefDto TABLE_2_COLUMNS_BRIEF_2_DTO = ColumnBriefDto.builder()
-            .id(COLUMN_2_3_ID)
-            .name("lng")
-            .internalName("lng")
-            .columnType(ColumnTypeDto.DECIMAL)
-            .build();
-
-    public static final List<ColumnDto> TABLE_2_COLUMNS_DTO = List.of(ColumnDto.builder()
-                    .id(COLUMN_2_1_ID)
-                    .tableId(TABLE_2_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(0)
-                    .name("location")
-                    .internalName("location")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(false)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_2_2_ID)
-                    .tableId(TABLE_2_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(1)
-                    .name("lat")
-                    .internalName("lat")
-                    .columnType(ColumnTypeDto.DOUBLE)
-                    .size(22L)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_2_3_ID)
-                    .tableId(TABLE_2_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(2)
-                    .name("lng")
-                    .internalName("lng")
-                    .columnType(ColumnTypeDto.DOUBLE)
-                    .size(22L)
-                    .isNullAllowed(true)
-                    .enums(null)
-                    .sets(null)
-                    .build());
-
-    public static final List<ColumnBriefDto> TABLE_2_COLUMNS_BRIEF_DTO = List.of(ColumnBriefDto.builder()
-                    .id(COLUMN_2_1_ID)
-                    .tableId(TABLE_2_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .name("location")
-                    .internalName("location")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .build(),
-            ColumnBriefDto.builder()
-                    .id(COLUMN_2_2_ID)
-                    .tableId(TABLE_2_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .name("lat")
-                    .internalName("lat")
-                    .columnType(ColumnTypeDto.DOUBLE)
-                    .build(),
-            ColumnBriefDto.builder()
-                    .id(COLUMN_2_3_ID)
-                    .tableId(TABLE_2_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .name("lng")
-                    .internalName("lng")
-                    .columnType(ColumnTypeDto.DOUBLE)
-                    .build());
-
-    public static final UUID COLUMN_3_1_ID = UUID.fromString("49cc2735-ba75-4e12-8ac7-8aec87ed7724");
-
-    public static final UUID COLUMN_3_2_ID = UUID.fromString("2c240d64-3052-4a74-b696-e7490fdff3ea");
-
-    public static final UUID COLUMN_3_3_ID = UUID.fromString("6fbb0a56-f23a-4aa4-b158-c614a0a30f86");
-
-    public static final UUID COLUMN_3_4_ID = UUID.fromString("9b01f925-93ee-4f28-bf31-9902900a7099");
-
-    public static final UUID COLUMN_3_5_ID = UUID.fromString("9bbd66f1-0d94-401c-b7f7-6e329bb9ee21");
-
-    public static final UUID COLUMN_3_6_ID = UUID.fromString("19ad93d7-b298-495b-9678-9aac80678ff9");
-
-    public static final UUID COLUMN_3_7_ID = UUID.fromString("4d27d9f4-645f-4222-b5a8-4a91fa6e4275");
-
-    public static final UUID COLUMN_3_8_ID = UUID.fromString("b4f8fcf8-5824-45ec-8c58-43f20e6dffc5");
-
-    public static final UUID COLUMN_3_9_ID = UUID.fromString("87247218-369e-484a-9a8f-d758478d8dfc");
-
-    public static final UUID COLUMN_3_10_ID = UUID.fromString("6e191b97-189a-4d88-901e-888ca889e280");
-
-    public static final UUID COLUMN_3_11_ID = UUID.fromString("6ac356ff-9be5-4259-9b62-83b6707be7fe");
-
-    public static final UUID COLUMN_3_12_ID = UUID.fromString("0665b384-c824-4358-b6c5-f17706d46ea4");
-
-    public static final UUID COLUMN_3_13_ID = UUID.fromString("22d3676e-d28e-4075-b223-91a7ac767bcf");
-
-    public static final UUID COLUMN_3_14_ID = UUID.fromString("673326e3-ee2b-4c2f-902f-982e2abce1c2");
-
-    public static final UUID COLUMN_3_15_ID = UUID.fromString("8dcacf4a-736b-4e67-9618-74998cba8940");
-
-    public static final UUID COLUMN_3_16_ID = UUID.fromString("2b2f5359-76d3-4763-a53f-d18ca6b793fb");
-
-    public static final UUID COLUMN_3_17_ID = UUID.fromString("674b6120-06cf-4624-b006-1ed48898bd69");
-
-    public static final UUID COLUMN_3_18_ID = UUID.fromString("13edd7c9-6c88-44d7-b206-34774e49c5af");
-
-    public static final UUID COLUMN_3_19_ID = UUID.fromString("6977bb3f-4ae2-43ea-bb82-c7f68454c538");
-
-    public static final UUID COLUMN_3_20_ID = UUID.fromString("c03d2429-53e1-42eb-a1f5-ce342fa23336");
-
-    public static final UUID COLUMN_3_21_ID = UUID.fromString("06edd332-750e-4aa1-b61b-e757fb2312c3");
-
-    public static final UUID COLUMN_3_22_ID = UUID.fromString("b6b8631d-f283-49da-8d5e-4bb24def2a40");
-
-    public static final UUID COLUMN_3_23_ID = UUID.fromString("0393ee00-31ba-44ab-9e82-1f5034a9f57b");
-
-    public static final UUID COLUMN_3_24_ID = UUID.fromString("a63784ea-f70d-4bda-ace6-1c6a88edf831");
-
-    public static final UUID COLUMN_3_25_ID = UUID.fromString("720fe829-802c-420b-8e41-bdbb636db43c");
-
-    public static final UUID COLUMN_3_26_ID = UUID.fromString("5bce38ef-7d49-43b5-9054-068750684b5f");
-
-    public static final UUID COLUMN_3_27_ID = UUID.fromString("92097c02-3dd3-40ea-bd03-a9135f45a557");
-
-    public static final UUID COLUMN_3_28_ID = UUID.fromString("7361a38a-828b-495e-8a57-b36cca17d7db");
-
-    public static final UUID COLUMN_3_29_ID = UUID.fromString("a06812db-03b7-484c-92a6-45d94eef3bb9");
-
-    public static final UUID COLUMN_3_30_ID = UUID.fromString("05614d89-9216-47ea-96f0-acffc4674acf");
-
-    public static final UUID COLUMN_3_31_ID = UUID.fromString("05ada13d-361a-48e7-9a0f-1191499509f1");
-
-    public static final UUID COLUMN_3_32_ID = UUID.fromString("b3f259f6-700a-4b60-8eac-dceaa0dcda9d");
-
-    public static final UUID COLUMN_3_33_ID = UUID.fromString("9160af06-e168-4b10-a7f9-520f41ae7955");
-
-    public static final UUID COLUMN_3_34_ID = UUID.fromString("fde20c99-ed9c-4a60-8c18-f46e8603ebb5");
-
-    public static final UUID COLUMN_3_35_ID = UUID.fromString("071c7f27-1cdd-4af9-b4d6-f932c27c7287");
-
-    public static final ColumnBriefDto TABLE_3_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
-            .id(COLUMN_3_1_ID)
-            .columnType(ColumnTypeDto.BIGINT)
-            .name("id")
-            .internalName("id")
-            .build();
-
-    public static final List<TableColumn> TABLE_3_COLUMNS = List.of(TableColumn.builder()
-                    .id(COLUMN_3_1_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(0)
-                    .columnType(TableColumnType.BIGINT)
-                    .name("id")
-                    .internalName("id")
-                    .isNullAllowed(false)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_2_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(1)
-                    .columnType(TableColumnType.INT)
-                    .name("linie")
-                    .internalName("linie")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_3_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(2)
-                    .columnType(TableColumnType.INT)
-                    .name("richtung")
-                    .internalName("richtung")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_4_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(3)
-                    .columnType(TableColumnType.DATE)
-                    .name("betriebsdatum")
-                    .internalName("betriebsdatum")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_5_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(4)
-                    .columnType(TableColumnType.INT)
-                    .name("fahrzeug")
-                    .internalName("fahrzeug")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_6_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(5)
-                    .columnType(TableColumnType.INT)
-                    .name("kurs")
-                    .internalName("kurs")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_7_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(6)
-                    .columnType(TableColumnType.INT)
-                    .name("seq_von")
-                    .internalName("seq_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_8_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(7)
-                    .columnType(TableColumnType.INT)
-                    .name("halt_diva_von")
-                    .internalName("halt_diva_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_9_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(8)
-                    .columnType(TableColumnType.INT)
-                    .name("halt_punkt_diva_von")
-                    .internalName("halt_punkt_diva_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_10_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(9)
-                    .columnType(TableColumnType.INT)
-                    .name("halt_kurz_von1")
-                    .internalName("halt_kurz_von1")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_11_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(10)
-                    .columnType(TableColumnType.DATE)
-                    .name("datum_von")
-                    .internalName("datum_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_12_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(11)
-                    .columnType(TableColumnType.INT)
-                    .name("soll_an_von")
-                    .internalName("soll_an_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_13_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(12)
-                    .columnType(TableColumnType.INT)
-                    .name("ist_an_von")
-                    .internalName("ist_an_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_14_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(13)
-                    .columnType(TableColumnType.INT)
-                    .name("soll_ab_von")
-                    .internalName("soll_ab_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_15_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(14)
-                    .columnType(TableColumnType.INT)
-                    .name("ist_ab_von")
-                    .internalName("ist_ab_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_16_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(15)
-                    .columnType(TableColumnType.INT)
-                    .name("seq_nach")
-                    .internalName("seq_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_17_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(16)
-                    .columnType(TableColumnType.INT)
-                    .name("halt_diva_nach")
-                    .internalName("halt_diva_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_18_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(17)
-                    .columnType(TableColumnType.INT)
-                    .name("halt_punkt_diva_nach")
-                    .internalName("halt_punkt_diva_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_19_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(18)
-                    .columnType(TableColumnType.INT)
-                    .name("halt_kurz_nach1")
-                    .internalName("halt_kurz_nach1")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_20_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(19)
-                    .columnType(TableColumnType.DATE)
-                    .name("datum_nach")
-                    .internalName("datum_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_21_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(20)
-                    .columnType(TableColumnType.INT)
-                    .name("soll_an_nach")
-                    .internalName("soll_an_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_22_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(21)
-                    .columnType(TableColumnType.INT)
-                    .name("ist_an_nach1")
-                    .internalName("ist_an_nach1")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_23_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(22)
-                    .columnType(TableColumnType.INT)
-                    .name("soll_ab_nach")
-                    .internalName("soll_ab_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_24_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(23)
-                    .columnType(TableColumnType.INT)
-                    .name("ist_ab_nach")
-                    .internalName("ist_ab_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_25_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(24)
-                    .columnType(TableColumnType.INT)
-                    .name("fahrt_id")
-                    .internalName("fahrt_id")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_26_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(25)
-                    .columnType(TableColumnType.INT)
-                    .name("fahrweg_id")
-                    .internalName("fahrweg_id")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_27_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(26)
-                    .columnType(TableColumnType.INT)
-                    .name("fw_no")
-                    .internalName("fw_no")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_28_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(27)
-                    .columnType(TableColumnType.INT)
-                    .name("fw_typ")
-                    .internalName("fw_typ")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_29_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(28)
-                    .columnType(TableColumnType.INT)
-                    .name("fw_kurz")
-                    .internalName("fw_kurz")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_30_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(29)
-                    .columnType(TableColumnType.INT)
-                    .name("fw_lang")
-                    .internalName("fw_lang")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_31_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(30)
-                    .columnType(TableColumnType.INT)
-                    .name("umlauf_von")
-                    .internalName("umlauf_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_32_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(31)
-                    .columnType(TableColumnType.INT)
-                    .name("halt_id_von")
-                    .internalName("halt_id_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_33_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(32)
-                    .columnType(TableColumnType.INT)
-                    .name("halt_id_nach")
-                    .internalName("halt_id_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_34_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(33)
-                    .columnType(TableColumnType.INT)
-                    .name("halt_punkt_id_von")
-                    .internalName("halt_punkt_id_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_35_ID)
-                    .table(TABLE_3)
-                    .ordinalPosition(34)
-                    .columnType(TableColumnType.INT)
-                    .name("halt_punkt_id_nach")
-                    .internalName("halt_punkt_id_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build());
-
-    public static final List<ColumnDto> TABLE_3_COLUMNS_DTO = List.of(ColumnDto.builder()
-                    .id(COLUMN_3_1_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.BIGINT)
-                    .name("id")
-                    .internalName("id")
-                    .isNullAllowed(false)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_2_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("linie")
-                    .internalName("linie")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_3_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("richtung")
-                    .internalName("richtung")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_4_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.DATE)
-                    .name("betriebsdatum")
-                    .internalName("betriebsdatum")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_5_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("fahrzeug")
-                    .internalName("fahrzeug")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_6_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("kurs")
-                    .internalName("kurs")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_7_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("seq_von")
-                    .internalName("seq_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_8_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("halt_diva_von")
-                    .internalName("halt_diva_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_9_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("halt_punkt_diva_von")
-                    .internalName("halt_punkt_diva_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_10_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("halt_kurz_von1")
-                    .internalName("halt_kurz_von1")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_11_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.DATE)
-                    .name("datum_von")
-                    .internalName("datum_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_12_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("soll_an_von")
-                    .internalName("soll_an_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_13_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("ist_an_von")
-                    .internalName("ist_an_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_14_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("soll_ab_von")
-                    .internalName("soll_ab_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_15_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("ist_ab_von")
-                    .internalName("ist_ab_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_16_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("seq_nach")
-                    .internalName("seq_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_17_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("halt_diva_nach")
-                    .internalName("halt_diva_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_18_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("halt_punkt_diva_nach")
-                    .internalName("halt_punkt_diva_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_19_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("halt_kurz_nach1")
-                    .internalName("halt_kurz_nach1")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_20_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.DATE)
-                    .name("datum_nach")
-                    .internalName("datum_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_21_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("soll_an_nach")
-                    .internalName("soll_an_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_22_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("ist_an_nach1")
-                    .internalName("ist_an_nach1")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_23_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("soll_ab_nach")
-                    .internalName("soll_ab_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_24_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("ist_ab_nach")
-                    .internalName("ist_ab_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_25_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("fahrt_id")
-                    .internalName("fahrt_id")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_26_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("fahrweg_id")
-                    .internalName("fahrweg_id")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_27_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("fw_no")
-                    .internalName("fw_no")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_28_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("fw_typ")
-                    .internalName("fw_typ")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_29_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("fw_kurz")
-                    .internalName("fw_kurz")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_30_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("fw_lang")
-                    .internalName("fw_lang")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_31_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("umlauf_von")
-                    .internalName("umlauf_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_32_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("halt_id_von")
-                    .internalName("halt_id_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_33_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("halt_id_nach")
-                    .internalName("halt_id_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_34_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("halt_punkt_id_von")
-                    .internalName("halt_punkt_id_von")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_3_35_ID)
-                    .tableId(TABLE_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .columnType(ColumnTypeDto.INT)
-                    .name("halt_punkt_id_nach")
-                    .internalName("halt_punkt_id_nach")
-                    .isNullAllowed(true)
-                    .enums(new LinkedList<>())
-                    .sets(new LinkedList<>())
-                    .build());
-
-    public static final UUID COLUMN_5_1_ID = UUID.fromString("4efd4cbb-ca2e-48e2-8f40-37514956aa67");
-
-    public static final UUID COLUMN_5_2_ID = UUID.fromString("53061685-c1db-4df6-ad4e-8f384a200104");
-
-    public static final UUID COLUMN_5_3_ID = UUID.fromString("643f9cda-8db1-47a4-bb08-c10e78e54c10");
-
-    public static final UUID COLUMN_5_4_ID = UUID.fromString("efeacc15-3b31-4a9f-9dba-f07d62dcddd6");
-
-    public static final UUID COLUMN_5_5_ID = UUID.fromString("0319db31-473a-47bc-bb9d-fa1edf82fcd5");
-
-    public static final UUID COLUMN_5_6_ID = UUID.fromString("9ba789ca-59cf-4480-b9f6-3b957b1d7f5c");
-
-    public static final UUID COLUMN_5_7_ID = UUID.fromString("81c42954-fd1a-4fef-adb1-bc4945469e26");
-
-    public static final UUID COLUMN_5_8_ID = UUID.fromString("49a38905-52a2-4a9b-b7b9-5e1dcf799b2a");
-
-    public static final UUID COLUMN_5_9_ID = UUID.fromString("1e1a9b6b-5aee-4773-b52d-ea56a5d1e2c8");
-
-    public static final UUID COLUMN_5_10_ID = UUID.fromString("42ede62a-ae98-4a14-ba54-76b8ba1c580f");
-
-    public static final UUID COLUMN_5_11_ID = UUID.fromString("0af0f84a-5a58-418a-8bbc-bde29ed0cda0");
-
-    public static final UUID COLUMN_5_12_ID = UUID.fromString("d9cb30a2-1566-4bd1-899d-060a8ba47722");
-
-    public static final UUID COLUMN_5_13_ID = UUID.fromString("e69f7f75-3731-4706-8193-0393aa0c08a7");
-
-    public static final UUID COLUMN_5_14_ID = UUID.fromString("4441630e-7dfa-4046-8bc2-929860f1c66e");
-
-    public static final UUID COLUMN_5_15_ID = UUID.fromString("f0a12be0-0b26-4686-bf7e-539cdc7e71b4");
-
-    public static final UUID COLUMN_5_16_ID = UUID.fromString("b60abdcc-5786-40f8-a309-e4467f7d963c");
-
-    public static final UUID COLUMN_5_17_ID = UUID.fromString("6d5877e2-daef-43d6-a1b6-1aff3ab1a9a2");
-
-    public static final UUID COLUMN_5_18_ID = UUID.fromString("bb45455f-d449-496e-94f8-eac4d46ba9c0");
-
-    public static final UUID COLUMN_5_19_ID = UUID.fromString("44c5484b-b57d-48a4-8f24-d2074de98e1a");
-
-    public static final UUID COLUMN_5_20_ID = UUID.fromString("6475b937-71fc-4331-bc85-8ee71fa68d99");
-
-    public static final UUID COLUMN_5_21_ID = UUID.fromString("92ff472f-e203-4c8e-b243-81640229ca19");
-
-    public static final ColumnBriefDto TABLE_5_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
-            .id(COLUMN_5_1_ID)
-            .name("id")
-            .internalName("id")
-            .columnType(ColumnTypeDto.BIGINT)
-            .build();
-
-    public static final List<TableColumn> TABLE_5_COLUMNS = List.of(TableColumn.builder()
-                    .id(COLUMN_5_1_ID)
-                    .ordinalPosition(0)
-                    .table(TABLE_5)
-                    .name("id")
-                    .internalName("id")
-                    .columnType(TableColumnType.BIGINT)
-                    .isNullAllowed(false)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_2_ID)
-                    .ordinalPosition(1)
-                    .table(TABLE_5)
-                    .name("Animal Name")
-                    .internalName("animal_name")
-                    .columnType(TableColumnType.VARCHAR)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_3_ID)
-                    .ordinalPosition(2)
-                    .table(TABLE_5)
-                    .name("Hair")
-                    .internalName("hair")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_4_ID)
-                    .ordinalPosition(3)
-                    .table(TABLE_5)
-                    .name("Feathers")
-                    .internalName("feathers")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_5_ID)
-                    .ordinalPosition(4)
-                    .table(TABLE_5)
-                    .name("Bread")
-                    .internalName("bread")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_6_ID)
-                    .ordinalPosition(5)
-                    .table(TABLE_5)
-                    .name("Eggs")
-                    .internalName("eggs")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_7_ID)
-                    .ordinalPosition(6)
-                    .table(TABLE_5)
-                    .name("Milk")
-                    .internalName("milk")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_8_ID)
-                    .ordinalPosition(7)
-                    .table(TABLE_5)
-                    .name("Water")
-                    .internalName("water")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_9_ID)
-                    .ordinalPosition(8)
-                    .table(TABLE_5)
-                    .name("Airborne")
-                    .internalName("airborne")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_10_ID)
-                    .ordinalPosition(9)
-                    .table(TABLE_5)
-                    .name("Waterborne")
-                    .internalName("waterborne")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_11_ID)
-                    .ordinalPosition(10)
-                    .table(TABLE_5)
-                    .name("Aquantic")
-                    .internalName("aquantic")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_12_ID)
-                    .ordinalPosition(11)
-                    .table(TABLE_5)
-                    .name("Predator")
-                    .internalName("predator")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_13_ID)
-                    .ordinalPosition(12)
-                    .table(TABLE_5)
-                    .name("Backbone")
-                    .internalName("backbone")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_14_ID)
-                    .ordinalPosition(13)
-                    .table(TABLE_5)
-                    .name("Breathes")
-                    .internalName("breathes")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_15_ID)
-                    .ordinalPosition(14)
-                    .table(TABLE_5)
-                    .name("Venomous")
-                    .internalName("venomous")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_16_ID)
-                    .ordinalPosition(15)
-                    .table(TABLE_5)
-                    .name("Fin")
-                    .internalName("fin")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_17_ID)
-                    .ordinalPosition(16)
-                    .table(TABLE_5)
-                    .name("Legs")
-                    .internalName("legs")
-                    .columnType(TableColumnType.INT)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_18_ID)
-                    .ordinalPosition(17)
-                    .table(TABLE_5)
-                    .name("Tail")
-                    .internalName("tail")
-                    .columnType(TableColumnType.DECIMAL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_19_ID)
-                    .ordinalPosition(18)
-                    .table(TABLE_5)
-                    .name("Domestic")
-                    .internalName("domestic")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_20_ID)
-                    .ordinalPosition(19)
-                    .table(TABLE_5)
-                    .name("Catsize")
-                    .internalName("catsize")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_5_21_ID)
-                    .ordinalPosition(20)
-                    .table(TABLE_5)
-                    .name("Class Type")
-                    .internalName("class_type")
-                    .columnType(TableColumnType.DECIMAL)
-                    .isNullAllowed(true)
-                    .build());
-
-    public static final List<ColumnDto> TABLE_5_COLUMNS_DTO = List.of(ColumnDto.builder()
-                    .id(COLUMN_5_1_ID)
-                    .ordinalPosition(0)
-                    .tableId(TABLE_5_ID)
-                    .name("id")
-                    .internalName("id")
-                    .columnType(ColumnTypeDto.BIGINT)
-                    .isNullAllowed(false)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_2_ID)
-                    .ordinalPosition(1)
-                    .tableId(TABLE_5_ID)
-                    .name("Animal Name")
-                    .internalName("animal_name")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_3_ID)
-                    .ordinalPosition(2)
-                    .tableId(TABLE_5_ID)
-                    .name("Hair")
-                    .internalName("hair")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_4_ID)
-                    .ordinalPosition(3)
-                    .tableId(TABLE_5_ID)
-                    .name("Feathers")
-                    .internalName("feathers")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_5_ID)
-                    .ordinalPosition(4)
-                    .tableId(TABLE_5_ID)
-                    .name("Bread")
-                    .internalName("bread")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_6_ID)
-                    .ordinalPosition(5)
-                    .tableId(TABLE_5_ID)
-                    .name("Eggs")
-                    .internalName("eggs")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_7_ID)
-                    .ordinalPosition(6)
-                    .tableId(TABLE_5_ID)
-                    .name("Milk")
-                    .internalName("milk")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_8_ID)
-                    .ordinalPosition(7)
-                    .tableId(TABLE_5_ID)
-                    .name("Water")
-                    .internalName("water")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_9_ID)
-                    .ordinalPosition(8)
-                    .tableId(TABLE_5_ID)
-                    .name("Airborne")
-                    .internalName("airborne")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_10_ID)
-                    .ordinalPosition(9)
-                    .tableId(TABLE_5_ID)
-                    .name("Waterborne")
-                    .internalName("waterborne")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_11_ID)
-                    .ordinalPosition(10)
-                    .tableId(TABLE_5_ID)
-                    .name("Aquantic")
-                    .internalName("aquantic")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_12_ID)
-                    .ordinalPosition(11)
-                    .tableId(TABLE_5_ID)
-                    .name("Predator")
-                    .internalName("predator")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_13_ID)
-                    .ordinalPosition(12)
-                    .tableId(TABLE_5_ID)
-                    .name("Backbone")
-                    .internalName("backbone")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_14_ID)
-                    .ordinalPosition(13)
-                    .tableId(TABLE_5_ID)
-                    .name("Breathes")
-                    .internalName("breathes")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_15_ID)
-                    .ordinalPosition(14)
-                    .tableId(TABLE_5_ID)
-                    .name("Venomous")
-                    .internalName("venomous")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_16_ID)
-                    .ordinalPosition(15)
-                    .tableId(TABLE_5_ID)
-                    .name("Fin")
-                    .internalName("fin")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_17_ID)
-                    .ordinalPosition(16)
-                    .tableId(TABLE_5_ID)
-                    .name("Legs")
-                    .internalName("legs")
-                    .columnType(ColumnTypeDto.INT)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_18_ID)
-                    .ordinalPosition(17)
-                    .tableId(TABLE_5_ID)
-                    .name("Tail")
-                    .internalName("tail")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_19_ID)
-                    .ordinalPosition(18)
-                    .tableId(TABLE_5_ID)
-                    .name("Domestic")
-                    .internalName("domestic")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_20_ID)
-                    .ordinalPosition(19)
-                    .tableId(TABLE_5_ID)
-                    .name("Catsize")
-                    .internalName("catsize")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_5_21_ID)
-                    .ordinalPosition(20)
-                    .tableId(TABLE_5_ID)
-                    .name("Class Type")
-                    .internalName("class_type")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .isNullAllowed(true)
-                    .build());
-
-    public static final List<CreateForeignKeyDto> TABLE_5_FOREIGN_KEYS_INVALID_CREATE = List.of(CreateForeignKeyDto.builder()
-            .columns(new LinkedList<>(List.of("somecolumn")))
-            .referencedTable("sometable")
-            .referencedColumns(new LinkedList<>(List.of("someothercolumn")))
-            .build());
-
-    public static final CreateTableConstraintsDto TABLE_5_CONSTRAINTS_INVALID_CREATE = CreateTableConstraintsDto.builder()
-            .foreignKeys(TABLE_5_FOREIGN_KEYS_INVALID_CREATE)
-            .build();
-
-    public static final List<CreateTableColumnDto> TABLE_5_COLUMNS_CREATE = List.of(CreateTableColumnDto.builder()
-                    .name("id")
-                    .type(ColumnTypeDto.BIGINT)
-                    .nullAllowed(false)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Animal Name")
-                    .type(ColumnTypeDto.VARCHAR)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Hair")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Feathers")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Bread")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Eggs")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Milk")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Water")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Airborne")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Waterborne")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Aquantic")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Predator")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Backbone")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Breathes")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Venomous")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Fin")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Legs")
-                    .type(ColumnTypeDto.INT)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Tail")
-                    .type(ColumnTypeDto.DECIMAL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Domestic")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Catsize")
-                    .type(ColumnTypeDto.BOOL)
-                    .nullAllowed(true)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("Class Type")
-                    .type(ColumnTypeDto.DECIMAL)
-                    .nullAllowed(true)
-                    .build());
-
-    public static final CreateTableConstraintsDto TABLE_5_CREATE_CONSTRAINTS_DTO = CreateTableConstraintsDto.builder()
-            .primaryKey(Set.of("id"))
-            .uniques(new LinkedList<>(List.of(List.of("id"))))
-            .checks(new LinkedHashSet<>())
-            .foreignKeys(new LinkedList<>())
-            .build();
-
-    public static final CreateTableDto TABLE_5_CREATE_DTO = CreateTableDto.builder()
-            .name(TABLE_5_NAME)
-            .description(TABLE_5_DESCRIPTION)
-            .columns(TABLE_5_COLUMNS_CREATE)
-            .constraints(TABLE_5_CREATE_CONSTRAINTS_DTO)
-            .build();
-
-    public static final CreateTableDto TABLE_5_INVALID_CREATE_DTO = CreateTableDto.builder()
-            .name(TABLE_5_NAME)
-            .description(TABLE_5_DESCRIPTION)
-            .columns(TABLE_5_COLUMNS_CREATE)
-            .constraints(TABLE_5_CONSTRAINTS_INVALID_CREATE)
-            .build();
-
-    public static final UUID QUERY_8_ID = UUID.fromString("1c466eee-d551-4ef9-a7e0-b5a2d1b15473");
-    public static final String QUERY_8_STATEMENT = "SELECT `id`, `animal_name` FROM `zoo` WHERE `hair` = TRUE AND `feathers` = FALSE;";
-    public static final String QUERY_8_QUERY_HASH = "f0ee0d6dd45e092fca120c4f0eab089f91ed26ccf8dc34a03c6b9c6bb4141271";
-    public static final Long QUERY_8_RESULT_NUMBER = 5L;
-    public static final String QUERY_8_RESULT_HASH = "b5f9cae916d32deff81c5f2e9f8ff43904034bc084b12320730953d120698bed";
-    public static final Instant QUERY_8_EXECUTION = Instant.now().minus(1, MINUTES);
-    public static final Boolean QUERY_8_PERSISTED = true;
-
-    public static final SubsetDto QUERY_8_SUBSET_DTO = SubsetDto.builder()
-            .tableId(TABLE_5_ID)
-            .columns(new LinkedList<>(List.of(COLUMN_5_1_ID, COLUMN_5_2_ID)))
-            .filter(new LinkedList<>(List.of(FilterDto.builder()
-                            .type(FilterTypeDto.WHERE)
-                            .columnId(COLUMN_5_3_ID)
-                            .operatorId(IMAGE_1_OPERATORS_2_ID)
-                            .value("true")
-                            .build(),
-                    FilterDto.builder()
-                            .type(FilterTypeDto.AND)
-                            .build(),
-                    FilterDto.builder()
-                            .type(FilterTypeDto.WHERE)
-                            .columnId(COLUMN_5_4_ID)
-                            .operatorId(IMAGE_1_OPERATORS_2_ID)
-                            .value("false")
-                            .build())))
-            .build();
-
-    public static final UUID COLUMN_6_1_ID = UUID.fromString("27b04a64-2849-4fae-b295-858c3e50361f");
-
-    public static final UUID COLUMN_6_2_ID = UUID.fromString("1ea62e32-5719-4152-94da-45d37eb88b6f");
-
-    public static final UUID COLUMN_6_3_ID = UUID.fromString("f523f9f5-42f7-4695-841e-a5fd30fa6879");
-
-    public static final UUID COLUMN_6_4_ID = UUID.fromString("f57ea880-f917-4127-bcbb-202a34831383");
-
-    public static final UUID COLUMN_6_5_ID = UUID.fromString("38aaeb63-b94b-4d90-8eae-a626dfb1f092");
-
-    public static final UUID COLUMN_6_6_ID = UUID.fromString("f788cf6f-66ed-4f28-8b24-d9d173c4d340");
-
-    public static final List<TableColumn> TABLE_6_COLUMNS = List.of(TableColumn.builder()
-                    .id(COLUMN_6_1_ID)
-                    .ordinalPosition(0)
-                    .table(TABLE_6)
-                    .name("id")
-                    .internalName("id")
-                    .columnType(TableColumnType.BIGINT)
-                    .isNullAllowed(false)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_6_2_ID)
-                    .ordinalPosition(1)
-                    .table(TABLE_6)
-                    .name("firstname")
-                    .internalName("firstname")
-                    .columnType(TableColumnType.VARCHAR)
-                    .isNullAllowed(false)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_6_3_ID)
-                    .ordinalPosition(2)
-                    .table(TABLE_6)
-                    .name("lastname")
-                    .internalName("lastname")
-                    .columnType(TableColumnType.VARCHAR)
-                    .isNullAllowed(false)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_6_4_ID)
-                    .ordinalPosition(3)
-                    .table(TABLE_6)
-                    .name("birth")
-                    .internalName("birth")
-                    .columnType(TableColumnType.YEAR)
-                    .isNullAllowed(false)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_6_5_ID)
-                    .ordinalPosition(4)
-                    .table(TABLE_6)
-                    .name("reminder")
-                    .internalName("reminder")
-                    .columnType(TableColumnType.TIME)
-                    .isNullAllowed(false)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_6_6_ID)
-                    .ordinalPosition(5)
-                    .table(TABLE_6)
-                    .name("ref_id")
-                    .internalName("ref_id")
-                    .columnType(TableColumnType.BIGINT)
-                    .isNullAllowed(true)
-                    .build());
-
-    public static final ColumnBriefDto TABLE_6_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
-            .id(COLUMN_6_1_ID)
-            .name("id")
-            .internalName("id")
-            .columnType(ColumnTypeDto.BIGINT)
-            .build();
-
-    public static final List<ColumnDto> TABLE_6_COLUMNS_DTO = List.of(ColumnDto.builder()
-                    .id(COLUMN_6_1_ID)
-                    .ordinalPosition(0)
-                    .tableId(TABLE_6_ID)
-                    .name("id")
-                    .internalName("id")
-                    .columnType(ColumnTypeDto.BIGINT)
-                    .isNullAllowed(false)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_6_2_ID)
-                    .ordinalPosition(1)
-                    .tableId(TABLE_6_ID)
-                    .name("firstname")
-                    .internalName("firstname")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .isNullAllowed(false)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_6_3_ID)
-                    .ordinalPosition(2)
-                    .tableId(TABLE_6_ID)
-                    .name("lastname")
-                    .internalName("lastname")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .isNullAllowed(false)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_6_4_ID)
-                    .ordinalPosition(3)
-                    .tableId(TABLE_6_ID)
-                    .name("birth")
-                    .internalName("birth")
-                    .columnType(ColumnTypeDto.YEAR)
-                    .isNullAllowed(false)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_6_5_ID)
-                    .ordinalPosition(4)
-                    .tableId(TABLE_6_ID)
-                    .name("reminder")
-                    .internalName("reminder")
-                    .columnType(ColumnTypeDto.TIME)
-                    .isNullAllowed(false)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_6_6_ID)
-                    .ordinalPosition(5)
-                    .tableId(TABLE_6_ID)
-                    .name("ref_id")
-                    .internalName("ref_id")
-                    .columnType(ColumnTypeDto.BIGINT)
-                    .isNullAllowed(true)
-                    .build());
-
-    public static final List<List<String>> TABLE_6_UNIQUES_CREATE = List.of(
-            List.of("firstname", "lastname"));
-
-    public static final List<CreateForeignKeyDto> TABLE_6_FOREIGN_KEYS_CREATE = List.of(CreateForeignKeyDto.builder()
-            .columns(new LinkedList<>(List.of("ref_id")))
-            .referencedTable("zoo")
-            .referencedColumns(new LinkedList<>(List.of("id")))
-            .build());
-
-    public static final Set<String> TABLE_6_CHECKS_CREATE = Set.of("firstname != lastname");
-
-    public static final CreateTableConstraintsDto TABLE_6_CONSTRAINTS_CREATE = CreateTableConstraintsDto.builder()
-            .uniques(TABLE_6_UNIQUES_CREATE)
-            .foreignKeys(TABLE_6_FOREIGN_KEYS_CREATE)
-            .checks(TABLE_6_CHECKS_CREATE)
-            .primaryKey(Set.of("id"))
-            .build();
-
-    public static final List<CreateTableColumnDto> TABLE_6_COLUMNS_CREATE = List.of(
-            CreateTableColumnDto.builder()
-                    .name("name_id")
-                    .type(ColumnTypeDto.BIGINT)
-                    .nullAllowed(false)
-                    .build(),
-            CreateTableColumnDto.builder()
-                    .name("zoo_id")
-                    .type(ColumnTypeDto.BIGINT)
-                    .size(255L)
-                    .nullAllowed(false)
-                    .build());
-
-    public static final CreateTableDto TABLE_6_CREATE_DTO = CreateTableDto.builder()
-            .name(TABLE_6_NAME)
-            .description(TABLE_6_DESCRIPTION)
-            .columns(TABLE_6_COLUMNS_CREATE)
-            .constraints(TABLE_6_CONSTRAINTS_CREATE)
-            .build();
-
-    public static final UUID COLUMN_7_1_ID = UUID.fromString("395b44a4-0e31-41ea-94ad-c4f2d5e912c6");
-
-    public static final UUID COLUMN_7_2_ID = UUID.fromString("5713333b-872a-44c5-ab94-4d0ab62f5663");
-
-    public static final ColumnBriefDto TABLE_7_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
-            .id(COLUMN_7_1_ID)
-            .name("name_id")
-            .internalName("name_id")
-            .columnType(ColumnTypeDto.BIGINT)
-            .build();
-
-    public static final ColumnBriefDto TABLE_7_COLUMNS_BRIEF_1_DTO = ColumnBriefDto.builder()
-            .id(COLUMN_7_2_ID)
-            .name("zoo_id")
-            .internalName("zoo_id")
-            .columnType(ColumnTypeDto.BIGINT)
-            .build();
-
-    public static final List<TableColumn> TABLE_7_COLUMNS = List.of(TableColumn.builder()
-                    .id(COLUMN_7_1_ID)
-                    .ordinalPosition(0)
-                    .table(TABLE_7)
-                    .name("name_id")
-                    .internalName("name_id")
-                    .columnType(TableColumnType.BIGINT)
-                    .isNullAllowed(false)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_7_2_ID)
-                    .ordinalPosition(1)
-                    .table(TABLE_7)
-                    .name("zoo_id")
-                    .internalName("zoo_id")
-                    .columnType(TableColumnType.BIGINT)
-                    .isNullAllowed(false)
-                    .build());
-
-    public static final List<ColumnDto> TABLE_7_COLUMNS_DTO = List.of(ColumnDto.builder()
-                    .id(COLUMN_7_1_ID)
-                    .ordinalPosition(0)
-                    .tableId(TABLE_7_ID)
-                    .name("name_id")
-                    .internalName("name_id")
-                    .columnType(ColumnTypeDto.BIGINT)
-                    .isNullAllowed(false)
-                    .build(),
-            ColumnDto.builder()
-                    .id(COLUMN_7_2_ID)
-                    .ordinalPosition(1)
-                    .tableId(TABLE_7_ID)
-                    .name("zoo_id")
-                    .internalName("zoo_id")
-                    .columnType(ColumnTypeDto.BIGINT)
-                    .isNullAllowed(false)
-                    .build());
-
-    public static final UUID VIEW_1_ID = UUID.fromString("7d712cf7-78c7-4a47-90b0-d6b9f7f19b70");
-    public static final Boolean VIEW_1_INITIAL_VIEW = false;
-    public static final String VIEW_1_NAME = "JUnit";
-    public static final String VIEW_1_INTERNAL_NAME = "junit";
-    public static final Boolean VIEW_1_PUBLIC = false;
-    public static final Boolean VIEW_1_SCHEMA_PUBLIC = false;
-    public static final String VIEW_1_QUERY = "SELECT `location`, `lat`, `lng` FROM `weather_location`";
-    public static final String VIEW_1_QUERY_HASH = "dc81a6877c7c51a6a6f406e1fc2a255e44a0d49a20548596e0d583c3eb849c23";
-
-    public static final UUID VIEW_COLUMN_1_1_ID = UUID.fromString("ebf2c5ce-4deb-4cc6-b6f6-61f5d3f6fc98");
-
-    public static final UUID VIEW_COLUMN_1_2_ID = UUID.fromString("d6ba3475-cefa-4771-aaa1-9274f16335ee");
-
-    public static final UUID VIEW_COLUMN_1_3_ID = UUID.fromString("4f189a5f-c9ca-4518-9758-1a0730f6276b");
-
-    public static final SubsetDto VIEW_1_SUBSET_DTO = SubsetDto.builder()
-            .tableId(TABLE_2_ID)
-            .columns(new LinkedList<>(List.of(COLUMN_2_1_ID, COLUMN_2_2_ID, COLUMN_2_3_ID)))
-            .build();
-
-    public static final List<ViewColumnDto> VIEW_1_COLUMNS_DTO = List.of(
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_1_1_ID)
-                    .ordinalPosition(0)
-                    .databaseId(DATABASE_1_ID)
-                    .name("location")
-                    .internalName("location")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(false)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_1_2_ID)
-                    .ordinalPosition(1)
-                    .databaseId(DATABASE_1_ID)
-                    .name("lat")
-                    .internalName("lat")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_1_3_ID)
-                    .ordinalPosition(2)
-                    .databaseId(DATABASE_1_ID)
-                    .name("lng")
-                    .internalName("lng")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .build()
-    );
-
-    public static final View VIEW_1 = View.builder()
-            .id(VIEW_1_ID)
-            .isInitialView(VIEW_1_INITIAL_VIEW)
-            .name(VIEW_1_NAME)
-            .internalName(VIEW_1_INTERNAL_NAME)
-            .isPublic(VIEW_1_PUBLIC)
-            .isSchemaPublic(VIEW_1_SCHEMA_PUBLIC)
-            .query(VIEW_1_QUERY)
-            .queryHash(VIEW_1_QUERY_HASH)
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .identifiers(new LinkedList<>()) /* IDENTIFIER_3 */
-            .columns(null) /* VIEW_1_COLUMNS */
-            .database(null) /* DATABASE_1 */
-            .build();
-
     public static final Long VIEW_1_DATA_COUNT = 3L;
     public static final List<Map<String, Object>> VIEW_1_DATA_DTO = new LinkedList<>(List.of(
             new HashMap<>() {{
@@ -4491,849 +813,6 @@ public class BaseTest {
             }}
     ));
 
-    public static final List<ViewColumn> VIEW_1_COLUMNS = List.of(
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_1_1_ID)
-                    .ordinalPosition(0)
-                    .name("location")
-                    .internalName("location")
-                    .columnType(TableColumnType.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(false)
-                    .view(VIEW_1)
-                    .build(),
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_1_2_ID)
-                    .ordinalPosition(1)
-                    .name("lat")
-                    .internalName("lat")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .view(VIEW_1)
-                    .build(),
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_1_3_ID)
-                    .ordinalPosition(2)
-                    .name("lng")
-                    .internalName("lng")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .view(VIEW_1)
-                    .build()
-    );
-
-    public static final ViewDto VIEW_1_DTO = ViewDto.builder()
-            .id(VIEW_1_ID)
-            .databaseId(DATABASE_1_ID)
-            .isInitialView(VIEW_1_INITIAL_VIEW)
-            .name(VIEW_1_NAME)
-            .internalName(VIEW_1_INTERNAL_NAME)
-            .isPublic(VIEW_1_PUBLIC)
-            .isSchemaPublic(VIEW_1_SCHEMA_PUBLIC)
-            .identifiers(null /* VIEW_1_DTO_IDENTIFIERS */)
-            .owner(USER_1_BRIEF_DTO)
-            .query(VIEW_1_QUERY)
-            .queryHash(VIEW_1_QUERY_HASH)
-            .columns(VIEW_1_COLUMNS_DTO)
-            .build();
-
-    public static final ViewBriefDto VIEW_1_BRIEF_DTO = ViewBriefDto.builder()
-            .id(VIEW_1_ID)
-            .isInitialView(VIEW_1_INITIAL_VIEW)
-            .name(VIEW_1_NAME)
-            .internalName(VIEW_1_INTERNAL_NAME)
-            .vdbid(DATABASE_1_ID)
-            .isPublic(VIEW_1_PUBLIC)
-            .isSchemaPublic(VIEW_1_SCHEMA_PUBLIC)
-            .ownedBy(USER_1.getId())
-            .query(VIEW_1_QUERY)
-            .queryHash(VIEW_1_QUERY_HASH)
-            .build();
-
-    public static final CreateViewDto VIEW_1_CREATE_DTO = CreateViewDto.builder()
-            .isPublic(VIEW_1_PUBLIC)
-            .name(VIEW_1_NAME)
-            .query(VIEW_1_SUBSET_DTO)
-            .build();
-
-    public static final UUID VIEW_2_ID = UUID.fromString("1921a0a0-e4b0-4d12-a05f-be920af9b5ce");
-    public static final Boolean VIEW_2_INITIAL_VIEW = false;
-    public static final String VIEW_2_NAME = "JUnit2";
-    public static final String VIEW_2_INTERNAL_NAME = "junit2";
-    public static final Boolean VIEW_2_PUBLIC = true;
-    public static final Boolean VIEW_2_SCHEMA_PUBLIC = true;
-    public static final String VIEW_2_QUERY = "select `date`, `location` as loc, `mintemp`, `rainfall` from `weather_aus` where `location` = 'Albury'";
-    public static final String VIEW_2_QUERY_HASH = "987fc946772ffb6d85060262dcb5df419692a1f6772ea995e3dedb53c191e984";
-
-    public static final UUID VIEW_COLUMN_2_1_ID = UUID.fromString("8fb30bce-04a8-4e9a-9c6b-0776eda3aab8");
-
-    public static final UUID VIEW_COLUMN_2_2_ID = UUID.fromString("d43f9940-ae27-4d81-b17b-ccbaf578186c");
-
-    public static final UUID VIEW_COLUMN_2_3_ID = UUID.fromString("b47733bb-aeea-414d-811e-405c64463730");
-
-    public static final UUID VIEW_COLUMN_2_4_ID = UUID.fromString("2b467e3a-acef-4944-be19-b4b0680874c2");
-
-    public static final List<ViewColumnDto> VIEW_2_COLUMNS_DTO = List.of(
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_2_1_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(0)
-                    .name("Date")
-                    .internalName("date")
-                    .columnType(ColumnTypeDto.DATE)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_2_2_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(1)
-                    .name("loc")
-                    .internalName("loc")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_2_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(2)
-                    .name("Rainfall")
-                    .internalName("rainfall")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_2_4_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(3)
-                    .name("MinTemp")
-                    .internalName("mintemp")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .build()
-    );
-
-    public static final View VIEW_2 = View.builder()
-            .id(VIEW_2_ID)
-            .isInitialView(VIEW_2_INITIAL_VIEW)
-            .name(VIEW_2_NAME)
-            .internalName(VIEW_2_INTERNAL_NAME)
-            .isPublic(VIEW_2_PUBLIC)
-            .isSchemaPublic(VIEW_2_SCHEMA_PUBLIC)
-            .columns(null)  /* VIEW_2_COLUMNS */
-            .query(VIEW_2_QUERY)
-            .queryHash(VIEW_2_QUERY_HASH)
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .database(null) /* DATABASE_1 */
-            .build();
-
-    public static final List<ViewColumn> VIEW_2_COLUMNS = List.of(
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_2_1_ID)
-                    .ordinalPosition(0)
-                    .name("Date")
-                    .internalName("date")
-                    .columnType(TableColumnType.DATE)
-                    .isNullAllowed(true)
-                    .view(VIEW_2)
-                    .build(),
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_2_2_ID)
-                    .ordinalPosition(1)
-                    .name("loc")
-                    .internalName("loc")
-                    .columnType(TableColumnType.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(true)
-                    .view(VIEW_2)
-                    .build(),
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_2_3_ID)
-                    .ordinalPosition(2)
-                    .name("Rainfall")
-                    .internalName("rainfall")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .view(VIEW_2)
-                    .build(),
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_2_4_ID)
-                    .ordinalPosition(3)
-                    .name("MinTemp")
-                    .internalName("mintemp")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .view(VIEW_2)
-                    .build()
-    );
-
-    public static final ViewDto VIEW_2_DTO = ViewDto.builder()
-            .id(VIEW_2_ID)
-            .databaseId(DATABASE_1_ID)
-            .isInitialView(VIEW_2_INITIAL_VIEW)
-            .name(VIEW_2_NAME)
-            .internalName(VIEW_2_INTERNAL_NAME)
-            .isPublic(VIEW_2_PUBLIC)
-            .isSchemaPublic(VIEW_2_SCHEMA_PUBLIC)
-            .columns(VIEW_2_COLUMNS_DTO)
-            .query(VIEW_2_QUERY)
-            .queryHash(VIEW_2_QUERY_HASH)
-            .owner(USER_1_BRIEF_DTO)
-            .build();
-
-    public static final ViewBriefDto VIEW_2_BRIEF_DTO = ViewBriefDto.builder()
-            .id(VIEW_2_ID)
-            .isInitialView(VIEW_2_INITIAL_VIEW)
-            .name(VIEW_2_NAME)
-            .internalName(VIEW_2_INTERNAL_NAME)
-            .vdbid(DATABASE_1_ID)
-            .isPublic(VIEW_2_PUBLIC)
-            .isSchemaPublic(VIEW_2_SCHEMA_PUBLIC)
-            .query(VIEW_2_QUERY)
-            .queryHash(VIEW_2_QUERY_HASH)
-            .ownedBy(USER_1.getId())
-            .build();
-
-    public static final UUID VIEW_3_ID = UUID.fromString("88940939-d456-4aae-88a6-f2b6b343c614");
-    public static final Boolean VIEW_3_INITIAL_VIEW = false;
-    public static final String VIEW_3_NAME = "JUnit3";
-    public static final String VIEW_3_INTERNAL_NAME = "junit3";
-    public static final Boolean VIEW_3_PUBLIC = true;
-    public static final Boolean VIEW_3_SCHEMA_PUBLIC = false;
-    public static final String VIEW_3_QUERY = "select w.`mintemp`, w.`rainfall`, w.`location`, m.`date` from `weather_aus` w join `junit2` m on m.`location` = w.`location` and m.`date` = w.`date`";
-    public static final String VIEW_3_QUERY_HASH = "bbbaa56a5206b3dc3e6cf9301b0db9344eb6f19b100c7b88550ffb597a0bd255";
-
-    public static final Long VIEW_3_DATA_COUNT = 3L;
-
-    public static final UUID VIEW_COLUMN_3_1_ID = UUID.fromString("129839cb-dbd7-492d-8fd0-ee44a8f51c4d");
-
-    public static final UUID VIEW_COLUMN_3_2_ID = UUID.fromString("e229d80a-c25c-4fbe-8f31-bbb2e1dff3d5");
-
-    public static final UUID VIEW_COLUMN_3_3_ID = UUID.fromString("12083a5d-fdd3-41db-9f92-d1298558e477");
-
-    public static final UUID VIEW_COLUMN_3_4_ID = UUID.fromString("668f8a87-1fa6-4be7-9761-1844aa8315a4");
-
-    public static final List<ViewColumnDto> VIEW_3_COLUMNS_DTO = List.of(
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_3_1_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(0)
-                    .name("MinTemp")
-                    .internalName("mintemp")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_3_2_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(1)
-                    .name("Rainfall")
-                    .internalName("rainfall")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_3_3_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(2)
-                    .name("Location")
-                    .internalName("location")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(VIEW_COLUMN_3_4_ID)
-                    .databaseId(DATABASE_1_ID)
-                    .ordinalPosition(3)
-                    .name("Date")
-                    .internalName("date")
-                    .columnType(ColumnTypeDto.DATE)
-                    .isNullAllowed(true)
-                    .build()
-    );
-
-    public static final View VIEW_3 = View.builder()
-            .id(VIEW_3_ID)
-            .isInitialView(VIEW_3_INITIAL_VIEW)
-            .name(VIEW_3_NAME)
-            .internalName(VIEW_3_INTERNAL_NAME)
-            .isPublic(VIEW_3_PUBLIC)
-            .isSchemaPublic(VIEW_3_SCHEMA_PUBLIC)
-            .columns(null)  /* VIEW_3_COLUMNS */
-            .query(VIEW_3_QUERY)
-            .queryHash(VIEW_3_QUERY_HASH)
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .database(null) /* DATABASE_1 */
-            .build();
-
-    public static final List<ViewColumn> VIEW_3_COLUMNS = List.of(
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_3_1_ID)
-                    .ordinalPosition(0)
-                    .name("MinTemp")
-                    .internalName("mintemp")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .view(VIEW_3)
-                    .build(),
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_3_2_ID)
-                    .ordinalPosition(1)
-                    .name("Rainfall")
-                    .internalName("rainfall")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .view(VIEW_3)
-                    .build(),
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_3_3_ID)
-                    .ordinalPosition(2)
-                    .name("Location")
-                    .internalName("location")
-                    .columnType(TableColumnType.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(true)
-                    .view(VIEW_3)
-                    .build(),
-            ViewColumn.builder()
-                    .id(VIEW_COLUMN_3_4_ID)
-                    .ordinalPosition(3)
-                    .name("Date")
-                    .internalName("date")
-                    .columnType(TableColumnType.DATE)
-                    .isNullAllowed(true)
-                    .view(VIEW_3)
-                    .build()
-    );
-
-    public static final ViewDto VIEW_3_DTO = ViewDto.builder()
-            .id(VIEW_3_ID)
-            .databaseId(DATABASE_1_ID)
-            .isInitialView(VIEW_3_INITIAL_VIEW)
-            .name(VIEW_3_NAME)
-            .internalName(VIEW_3_INTERNAL_NAME)
-            .isPublic(VIEW_3_PUBLIC)
-            .isSchemaPublic(VIEW_3_SCHEMA_PUBLIC)
-            .columns(VIEW_3_COLUMNS_DTO)
-            .query(VIEW_3_QUERY)
-            .queryHash(VIEW_3_QUERY_HASH)
-            .owner(USER_1_BRIEF_DTO)
-            .build();
-
-    public static final ViewBriefDto VIEW_3_BRIEF_DTO = ViewBriefDto.builder()
-            .id(VIEW_3_ID)
-            .isInitialView(VIEW_3_INITIAL_VIEW)
-            .name(VIEW_3_NAME)
-            .internalName(VIEW_3_INTERNAL_NAME)
-            .vdbid(DATABASE_1_ID)
-            .isPublic(VIEW_3_PUBLIC)
-            .isSchemaPublic(VIEW_3_SCHEMA_PUBLIC)
-            .query(VIEW_3_QUERY)
-            .queryHash(VIEW_3_QUERY_HASH)
-            .ownedBy(USER_1.getId())
-            .build();
-
-    public static final UUID VIEW_4_ID = UUID.fromString("13b36fa0-a65a-4ccf-80b1-5b3a2444a41a");
-    public static final Boolean VIEW_4_INITIAL_VIEW = false;
-    public static final String VIEW_4_NAME = "Mock View";
-    public static final String VIEW_4_INTERNAL_NAME = "mock_view";
-    public static final Table VIEW_4_TABLE = TABLE_5;
-    public static final Boolean VIEW_4_PUBLIC = true;
-    public static final Boolean VIEW_4_SCHEMA_PUBLIC = false;
-    public static final String VIEW_4_QUERY = "SELECT `animal_name`, `hair`, `feathers`, `eggs`, `milk`, `airborne`, `aquatic`, `predator`, `backbone`, `breathes`, `venomous`, `fins`, `legs`, `tail`, `domestic`, `catsize`, `class_type` FROM `zoo` WHERE `class_type` = 1";
-    public static final String VIEW_4_QUERY_HASH = "3561cd0bb0b0e94d6f15ae602134252a5760d09d660a71a4fb015b6991c8ba0b";
-
-    public static final List<ViewColumnDto> VIEW_4_COLUMNS_DTO = List.of(
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_1_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(0)
-                    .name("Animal Name")
-                    .internalName("animal_name")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_2_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(1)
-                    .name("Hair")
-                    .internalName("hair")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_3_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(2)
-                    .name("Feathers")
-                    .internalName("feathers")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_4_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(3)
-                    .name("Eggs")
-                    .internalName("eggs")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_5_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(4)
-                    .name("Milk")
-                    .internalName("milk")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_6_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(5)
-                    .name("Airborne")
-                    .internalName("airborne")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_7_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(6)
-                    .name("Aquantic")
-                    .internalName("aquantic")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_8_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(7)
-                    .name("Predator")
-                    .internalName("predator")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_9_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(8)
-                    .name("Backbone")
-                    .internalName("backbone")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_10_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(9)
-                    .name("Breathes")
-                    .internalName("breathes")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_11_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(10)
-                    .name("Venomous")
-                    .internalName("venomous")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_12_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(11)
-                    .name("Fin")
-                    .internalName("fin")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_13_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(12)
-                    .name("Legs")
-                    .internalName("legs")
-                    .columnType(ColumnTypeDto.INT)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_14_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(13)
-                    .name("Tail")
-                    .internalName("tail")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_15_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(14)
-                    .name("Domestic")
-                    .internalName("domestic")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_16_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(15)
-                    .name("Catsize")
-                    .internalName("catsize")
-                    .columnType(ColumnTypeDto.BOOL)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_5_17_ID)
-                    .databaseId(DATABASE_2_ID)
-                    .ordinalPosition(16)
-                    .name("Class Type")
-                    .internalName("class_type")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .isNullAllowed(true)
-                    .build());
-
-    public static final View VIEW_4 = View.builder()
-            .id(VIEW_4_ID)
-            .isInitialView(VIEW_4_INITIAL_VIEW)
-            .name(VIEW_4_NAME)
-            .internalName(VIEW_4_INTERNAL_NAME)
-            .isPublic(VIEW_4_PUBLIC)
-            .isSchemaPublic(VIEW_4_SCHEMA_PUBLIC)
-            .query(VIEW_4_QUERY)
-            .queryHash(VIEW_4_QUERY_HASH)
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .columns(null) /* VIEW_4_COLUMNS */
-            .build();
-
-    public static final ViewDto VIEW_4_DTO = ViewDto.builder()
-            .id(VIEW_4_ID)
-            .databaseId(DATABASE_2_ID)
-            .isInitialView(VIEW_4_INITIAL_VIEW)
-            .name(VIEW_4_NAME)
-            .internalName(VIEW_4_INTERNAL_NAME)
-            .isPublic(VIEW_4_PUBLIC)
-            .isSchemaPublic(VIEW_4_SCHEMA_PUBLIC)
-            .query(VIEW_4_QUERY)
-            .queryHash(VIEW_4_QUERY_HASH)
-            .owner(USER_1_BRIEF_DTO)
-            .columns(VIEW_4_COLUMNS_DTO)
-            .build();
-
-    public static final ViewBriefDto VIEW_4_BRIEF_DTO = ViewBriefDto.builder()
-            .id(VIEW_4_ID)
-            .isInitialView(VIEW_4_INITIAL_VIEW)
-            .name(VIEW_4_NAME)
-            .internalName(VIEW_4_INTERNAL_NAME)
-            .vdbid(DATABASE_2_ID)
-            .isPublic(VIEW_4_PUBLIC)
-            .isSchemaPublic(VIEW_4_SCHEMA_PUBLIC)
-            .query(VIEW_4_QUERY)
-            .queryHash(VIEW_4_QUERY_HASH)
-            .ownedBy(USER_1.getId())
-            .build();
-
-    public static final List<ViewColumn> VIEW_4_COLUMNS = List.of(
-            ViewColumn.builder()
-                    .id(COLUMN_5_1_ID)
-                    .ordinalPosition(0)
-                    .name("Animal Name")
-                    .internalName("animal_name")
-                    .columnType(TableColumnType.VARCHAR)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_2_ID)
-                    .ordinalPosition(1)
-                    .name("Hair")
-                    .internalName("hair")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_3_ID)
-                    .ordinalPosition(2)
-                    .name("Feathers")
-                    .internalName("feathers")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_4_ID)
-                    .ordinalPosition(3)
-                    .name("Eggs")
-                    .internalName("eggs")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_5_ID)
-                    .ordinalPosition(4)
-                    .name("Milk")
-                    .internalName("milk")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_6_ID)
-                    .ordinalPosition(5)
-                    .name("Airborne")
-                    .internalName("airborne")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_7_ID)
-                    .ordinalPosition(6)
-                    .name("Aquantic")
-                    .internalName("aquantic")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_8_ID)
-                    .ordinalPosition(7)
-                    .name("Predator")
-                    .internalName("predator")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_9_ID)
-                    .ordinalPosition(8)
-                    .name("Backbone")
-                    .internalName("backbone")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_10_ID)
-                    .ordinalPosition(9)
-                    .name("Breathes")
-                    .internalName("breathes")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_11_ID)
-                    .ordinalPosition(10)
-                    .name("Venomous")
-                    .internalName("venomous")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_12_ID)
-                    .ordinalPosition(11)
-                    .name("Fin")
-                    .internalName("fin")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_13_ID)
-                    .ordinalPosition(12)
-                    .name("Legs")
-                    .internalName("legs")
-                    .columnType(TableColumnType.INT)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_14_ID)
-                    .ordinalPosition(13)
-                    .name("Tail")
-                    .internalName("tail")
-                    .columnType(TableColumnType.DECIMAL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_15_ID)
-                    .ordinalPosition(14)
-                    .name("Domestic")
-                    .internalName("domestic")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_16_ID)
-                    .ordinalPosition(15)
-                    .name("Catsize")
-                    .internalName("catsize")
-                    .columnType(TableColumnType.BOOL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_5_17_ID)
-                    .ordinalPosition(16)
-                    .name("Class Type")
-                    .internalName("class_type")
-                    .columnType(TableColumnType.DECIMAL)
-                    .isNullAllowed(true)
-                    .view(VIEW_4)
-                    .build());
-
-    public static final UUID VIEW_5_ID = UUID.fromString("bc6b8507-51f1-4d05-bb0c-1f619a991dec");
-    public static final Boolean VIEW_5_INITIAL_VIEW = false;
-    public static final String VIEW_5_NAME = "Mock View";
-    public static final String VIEW_5_INTERNAL_NAME = "mock_view";
-    public static final Boolean VIEW_5_PUBLIC = true;
-    public static final Boolean VIEW_5_SCHEMA_PUBLIC = true;
-    public static final String VIEW_5_QUERY = "SELECT `location`, `lat`, `lng` FROM `weather_location` WHERE `location` = 'Albury'";
-    public static final String VIEW_5_QUERY_HASH = "120f32478aaff874c25ab32eceb9f00b64cc9d422831046f2f5d43953aca01e7";
-
-    public static final View VIEW_5 = View.builder()
-            .id(VIEW_5_ID)
-            .isInitialView(VIEW_5_INITIAL_VIEW)
-            .name(VIEW_5_NAME)
-            .internalName(VIEW_5_INTERNAL_NAME)
-            .isPublic(VIEW_5_PUBLIC)
-            .isSchemaPublic(VIEW_5_SCHEMA_PUBLIC)
-            .query(VIEW_5_QUERY)
-            .queryHash(VIEW_5_QUERY_HASH)
-            .ownedBy(USER_1.getId())
-            .owner(USER_1)
-            .columns(null)
-            .build();
-
-    public static final ViewDto VIEW_5_DTO = ViewDto.builder()
-            .id(VIEW_5_ID)
-            .databaseId(DATABASE_3_ID)
-            .isInitialView(VIEW_5_INITIAL_VIEW)
-            .name(VIEW_5_NAME)
-            .internalName(VIEW_5_INTERNAL_NAME)
-            .isPublic(VIEW_5_PUBLIC)
-            .isSchemaPublic(VIEW_5_SCHEMA_PUBLIC)
-            .query(VIEW_5_QUERY)
-            .queryHash(VIEW_5_QUERY_HASH)
-            .owner(USER_1_BRIEF_DTO)
-            .columns(new LinkedList<>())
-            .build();
-
-    public static final ViewBriefDto VIEW_5_BRIEF_DTO = ViewBriefDto.builder()
-            .id(VIEW_5_ID)
-            .isInitialView(VIEW_5_INITIAL_VIEW)
-            .name(VIEW_5_NAME)
-            .internalName(VIEW_5_INTERNAL_NAME)
-            .vdbid(DATABASE_3_ID)
-            .isPublic(VIEW_5_PUBLIC)
-            .isSchemaPublic(VIEW_5_SCHEMA_PUBLIC)
-            .query(VIEW_5_QUERY)
-            .queryHash(VIEW_5_QUERY_HASH)
-            .build();
-
-    public static final List<ViewColumn> VIEW_5_COLUMNS = List.of(
-            ViewColumn.builder()
-                    .id(COLUMN_2_1_ID)
-                    .ordinalPosition(0)
-                    .name("location")
-                    .internalName("location")
-                    .columnType(TableColumnType.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(false)
-                    .view(VIEW_5)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_2_2_ID)
-                    .ordinalPosition(1)
-                    .name("lat")
-                    .internalName("lat")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .view(VIEW_5)
-                    .build(),
-            ViewColumn.builder()
-                    .id(COLUMN_2_3_ID)
-                    .ordinalPosition(2)
-                    .name("lng")
-                    .internalName("lng")
-                    .columnType(TableColumnType.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .view(VIEW_5)
-                    .build());
-
-    public static final List<ViewColumnDto> VIEW_5_COLUMNS_DTO = List.of(
-            ViewColumnDto.builder()
-                    .id(COLUMN_2_1_ID)
-                    .databaseId(DATABASE_3_ID)
-                    .ordinalPosition(0)
-                    .name("location")
-                    .internalName("location")
-                    .columnType(ColumnTypeDto.VARCHAR)
-                    .size(255L)
-                    .isNullAllowed(false)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_2_2_ID)
-                    .databaseId(DATABASE_3_ID)
-                    .ordinalPosition(1)
-                    .name("lat")
-                    .internalName("lat")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .build(),
-            ViewColumnDto.builder()
-                    .id(COLUMN_2_3_ID)
-                    .databaseId(DATABASE_3_ID)
-                    .ordinalPosition(2)
-                    .name("lng")
-                    .internalName("lng")
-                    .columnType(ColumnTypeDto.DECIMAL)
-                    .size(10L)
-                    .d(0L)
-                    .isNullAllowed(true)
-                    .build());
-
     public static final Long QUERY_1_RESULT_ID = 1L;
     public static final List<Map<String, Object>> QUERY_1_RESULT_DTO = new LinkedList<>(List.of(
             new HashMap<>() {{
@@ -5358,15 +837,7 @@ public class BaseTest {
             .identifier(LICENSE_1_IDENTIFIER)
             .uri(LICENSE_1_URI)
             .build();
-
-    public static final UUID FUNDER_1_ID = UUID.fromString("8deb273d-6dd6-407d-970a-01534035ac01");
-    public static final String FUNDER_1_NAME = "European Commission";
-    public static final String FUNDER_1_IDENTIFIER = "https://doi.org/10.13039/501100000780";
-    public static final String FUNDER_1_IDENTIFIER_ID_ONLY = "10.13039/501100000780";
-    public static final IdentifierFunderType FUNDER_1_IDENTIFIER_TYPE = IdentifierFunderType.CROSSREF_FUNDER_ID;
-    public static final IdentifierFunderTypeDto FUNDER_1_IDENTIFIER_TYPE_DTO = IdentifierFunderTypeDto.CROSSREF_FUNDER_ID;
-    public static final String FUNDER_1_AWARD_TITLE = "Institutionalizing global genetic-resource commons. Global Strategies for accessing and using essential public knowledge assets in the life science";
-
+    
     public static final String VIRTUAL_HOST_NAME = "fda";
     public static final String VIRTUAL_HOST_DESCRIPTION = "FAIR Data Austria";
     public static final String VIRTUAL_HOST_TAGS = "";
@@ -5448,50 +919,6 @@ public class BaseTest {
             .displayEnd(BANNER_MESSAGE_2_END)
             .build();
 
-    public static final CreateDashboardDto DATABASE_1_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
-            .databaseName(DATABASE_1_INTERNALNAME)
-            .isPublic(DATABASE_1_PUBLIC)
-            .isSchemaPublic(DATABASE_1_SCHEMA_PUBLIC)
-            .ownerUsername(USER_1.getUsername())
-            .build();
-
-    public static final CreateDashboardResponseDto DATABASE_1_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
-            .uid(DATABASE_1_DASHBOARD_UID)
-            .build();
-
-    public static final CreateDashboardDto DATABASE_2_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
-            .databaseName(DATABASE_2_INTERNALNAME)
-            .isPublic(DATABASE_2_PUBLIC)
-            .isSchemaPublic(DATABASE_2_SCHEMA_PUBLIC)
-            .ownerUsername(USER_2.getUsername())
-            .build();
-
-    public static final CreateDashboardResponseDto DATABASE_2_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
-            .uid(DATABASE_2_DASHBOARD_UID)
-            .build();
-
-    public static final CreateDashboardDto DATABASE_3_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
-            .databaseName(DATABASE_3_INTERNALNAME)
-            .isPublic(DATABASE_3_PUBLIC)
-            .isSchemaPublic(DATABASE_3_SCHEMA_PUBLIC)
-            .ownerUsername(USER_3.getUsername())
-            .build();
-
-    public static final CreateDashboardResponseDto DATABASE_3_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
-            .uid(DATABASE_3_DASHBOARD_UID)
-            .build();
-
-    public static final CreateDashboardDto DATABASE_4_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
-            .databaseName(DATABASE_4_INTERNALNAME)
-            .isPublic(DATABASE_4_PUBLIC)
-            .isSchemaPublic(DATABASE_4_SCHEMA_PUBLIC)
-            .ownerUsername(USER_4.getUsername())
-            .build();
-
-    public static final CreateDashboardResponseDto DATABASE_4_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
-            .uid(DATABASE_4_DASHBOARD_UID)
-            .build();
-
     public static final ExportResourceDto EXPORT_RESOURCE_DTO = ExportResourceDto.builder()
             .filename("68b329da9893e34099c7d8ad5cb9c940")
             .resource(new InputStreamResource(InputStream.nullInputStream()))
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-1.json b/lib/java/dbrepo-core/src/main/resources/identifier-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..a06296d76de182feb9ba9a27e489d44af31b1b54
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/identifier-1.json
@@ -0,0 +1,74 @@
+{
+  "id" : "679a83f2-ef23-4b4b-98f7-ad77b9d68733",
+  "queryId" : "60494137-f000-459e-acd3-4fcadbdf14ca",
+  "creators" : [ {
+    "id" : "667cd1d6-4f94-4808-b5cb-12e5ec0788d8",
+    "firstname" : "Max",
+    "lastname" : "Mustermann",
+    "creatorName" : "Mustermann, Max",
+    "nameType" : "PERSONAL",
+    "nameIdentifier" : "00000-00000-00000",
+    "nameIdentifierScheme" : "ORCID",
+    "affiliation" : "TU Graz",
+    "affiliationIdentifier" : "https://ror.org/04wn28048",
+    "affiliationIdentifierScheme" : "ROR",
+    "affiliationIdentifierSchemeUri" : "https://ror.org/",
+    "apaName" : "M., Mustermann",
+    "bibtexName" : "Mustermann, Max",
+    "ieeeName" : "M. Mustermann"
+  } ],
+  "publisher" : "Austrian Government",
+  "status" : "PUBLISHED",
+  "titles" : [ {
+    "id" : "3df6b286-9bd2-4ae3-b8f4-29c217544bef",
+    "title" : "Austrian weather data",
+    "language" : "EN"
+  }, {
+    "id" : "903a7e5b-8014-4b8a-b8fd-44f477880905",
+    "title" : "Österreichische Wetterdaten",
+    "titleType" : "TRANSLATED_TITLE",
+    "language" : "EN"
+  } ],
+  "descriptions" : [ {
+    "id" : "1c438756-93f0-4797-983c-175a17e18c2c",
+    "description" : "Selecting all from the weather Austrian table",
+    "language" : "EN"
+  } ],
+  "funders" : [ {
+    "id" : "8deb273d-6dd6-407d-970a-01534035ac01",
+    "funderName" : "European Commission",
+    "funderIdentifier" : "https://doi.org/10.13039/501100000780",
+    "funderIdentifierType" : "CROSSREF_FUNDER_ID",
+    "awardTitle" : "Institutionalizing global genetic-resource commons. Global Strategies for accessing and using essential public knowledge assets in the life science"
+  } ],
+  "licenses" : [ {
+    "identifier" : "MIT",
+    "uri" : "https://opensource.org/license/mit/"
+  } ],
+  "type" : "DATABASE",
+  "query" : "SELECT `id`, `date`, `location`, `mintemp`, `rainfall` FROM `weather_aus` ORDER BY id ASC",
+  "queryNormalized" : "SELECT `id`, `date`, `location`, `mintemp`, `rainfall` FROM `weather_aus` ORDER BY id ASC",
+  "queryHash" : "a3b8ac39e38167d14cf3a9c20a69e4b6954d049525390b973a2c23064953a992",
+  "resultHash" : "8358c8ade4849d2094ab5bb29127afdae57e6bb5acb1db7af603813d406c467a",
+  "execution" : "2018-11-07T10:59:12.000Z",
+  "resultNumber" : 2,
+  "publicationYear" : 2022,
+  "publicationMonth" : 5,
+  "doi" : "10.12345/183",
+  "ownedBy" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+  "owner" : {
+    "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+    "keycloakId" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+    "username" : "junit1",
+    "firstname" : "John",
+    "lastname" : "Doe",
+    "orcid" : "https://orcid.org/0000-0003-4216-302X",
+    "affiliation" : "TU Graz",
+    "language" : "en",
+    "theme" : "light",
+    "mariadbPassword" : "*440BA4FD1A87A0999647DB67C0EE258198B247BA",
+    "isInternal" : false
+  },
+  "created" : "2022-01-07T20:45:52Z",
+  "lastModified" : "2018-11-07T10:59:12Z"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-2.json b/lib/java/dbrepo-core/src/main/resources/identifier-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..1afd043c0f8500f5b2997f7bd95e5799ecf9ad31
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/identifier-2.json
@@ -0,0 +1,39 @@
+{
+  "id" : "fdb95f60-48e7-4e74-8122-d3c8d079c889",
+  "queryId" : "60494137-f000-459e-acd3-4fcadbdf14ca",
+  "creators" : [ ],
+  "publisher" : "Swedish Government",
+  "status" : "PUBLISHED",
+  "titles" : [ ],
+  "descriptions" : [ ],
+  "licenses" : [ {
+    "identifier" : "MIT",
+    "uri" : "https://opensource.org/license/mit/"
+  } ],
+  "type" : "SUBSET",
+  "query" : "SELECT `id`, `date`, `location`, `mintemp`, `rainfall` FROM `weather_aus` ORDER BY id ASC",
+  "queryNormalized" : "SELECT `id`, `date`, `location`, `mintemp`, `rainfall` FROM `weather_aus` ORDER BY id ASC",
+  "queryHash" : "a3b8ac39e38167d14cf3a9c20a69e4b6954d049525390b973a2c23064953a992",
+  "resultHash" : "8358c8ade4849d2094ab5bb29127afdae57e6bb5acb1db7af603813d406c467a",
+  "execution" : "2019-03-03T04:45:52.000Z",
+  "resultNumber" : 2,
+  "publicationYear" : 2023,
+  "publicationMonth" : 7,
+  "publicationDay" : 10,
+  "ownedBy" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+  "owner" : {
+    "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+    "keycloakId" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+    "username" : "junit1",
+    "firstname" : "John",
+    "lastname" : "Doe",
+    "orcid" : "https://orcid.org/0000-0003-4216-302X",
+    "affiliation" : "TU Graz",
+    "language" : "en",
+    "theme" : "light",
+    "mariadbPassword" : "*440BA4FD1A87A0999647DB67C0EE258198B247BA",
+    "isInternal" : false
+  },
+  "created" : "2022-05-03T14:32:32Z",
+  "lastModified" : "2019-03-03T04:45:52Z"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-3.json b/lib/java/dbrepo-core/src/main/resources/identifier-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..a51ecb51ca1e3a37e9b912c2b652a6a00635684f
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/identifier-3.json
@@ -0,0 +1,37 @@
+{
+  "id" : "e2d831c2-3694-4fdc-8c48-7a7e94b73c43",
+  "viewId" : "7d712cf7-78c7-4a47-90b0-d6b9f7f19b70",
+  "creators" : [ ],
+  "publisher" : "Polish Government",
+  "status" : "PUBLISHED",
+  "titles" : [ ],
+  "descriptions" : [ ],
+  "licenses" : [ {
+    "identifier" : "MIT",
+    "uri" : "https://opensource.org/license/mit/"
+  } ],
+  "type" : "VIEW",
+  "query" : "SELECT `location`, `lat`, `lng` FROM `weather_location`",
+  "queryNormalized" : "SELECT `location`, `lat`, `lng` FROM `weather_location`",
+  "queryHash" : "dc81a6877c7c51a6a6f406e1fc2a255e44a0d49a20548596e0d583c3eb849c23",
+  "execution" : "2019-03-03T04:45:52.000Z",
+  "publicationYear" : 2023,
+  "publicationMonth" : 7,
+  "publicationDay" : 10,
+  "ownedBy" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+  "owner" : {
+    "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+    "keycloakId" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+    "username" : "junit1",
+    "firstname" : "John",
+    "lastname" : "Doe",
+    "orcid" : "https://orcid.org/0000-0003-4216-302X",
+    "affiliation" : "TU Graz",
+    "language" : "en",
+    "theme" : "light",
+    "mariadbPassword" : "*440BA4FD1A87A0999647DB67C0EE258198B247BA",
+    "isInternal" : false
+  },
+  "created" : "2022-05-03T14:32:32Z",
+  "lastModified" : "2019-03-03T04:45:52Z"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-4.json b/lib/java/dbrepo-core/src/main/resources/identifier-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..ef5bb67fa4a79792ce1071fbac462daace047815
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/identifier-4.json
@@ -0,0 +1,34 @@
+{
+  "id" : "3bd69bb8-f7e3-48e4-9717-823787e7ba23",
+  "tableId" : "666d0b6b-f017-4f7c-80d8-a47174d8b539",
+  "creators" : [ ],
+  "publisher" : "Example Publisher",
+  "status" : "PUBLISHED",
+  "titles" : [ ],
+  "descriptions" : [ ],
+  "licenses" : [ {
+    "identifier" : "MIT",
+    "uri" : "https://opensource.org/license/mit/"
+  } ],
+  "type" : "TABLE",
+  "execution" : "2019-03-03T04:45:52.000Z",
+  "publicationYear" : 2023,
+  "publicationMonth" : 7,
+  "publicationDay" : 10,
+  "ownedBy" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+  "owner" : {
+    "id" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+    "keycloakId" : "cd5bab0d-7799-4069-85fb-c5d738572a0b",
+    "username" : "junit1",
+    "firstname" : "John",
+    "lastname" : "Doe",
+    "orcid" : "https://orcid.org/0000-0003-4216-302X",
+    "affiliation" : "TU Graz",
+    "language" : "en",
+    "theme" : "light",
+    "mariadbPassword" : "*440BA4FD1A87A0999647DB67C0EE258198B247BA",
+    "isInternal" : false
+  },
+  "created" : "2025-07-04T00:19:12Z",
+  "lastModified" : "2019-03-03T04:45:52Z"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-5.json b/lib/java/dbrepo-core/src/main/resources/identifier-5.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d3da7ad81b008afcd1e19ab70f071e2f503b49e
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/identifier-5.json
@@ -0,0 +1,71 @@
+{
+  "id" : "e05bb4c9-ed26-48c9-bd91-5c48a93a04bd",
+  "queryId" : "4e0ac92a-7cb3-4222-9b85-0498c73e0afd",
+  "creators" : [ {
+    "id" : "6844b684-93e4-47d2-a615-5939127fdafe",
+    "firstname" : "Max",
+    "lastname" : "Mustermann",
+    "creatorName" : "Mustermann, Max",
+    "nameIdentifier" : "00000-00000-00000",
+    "nameIdentifierScheme" : "ORCID",
+    "affiliation" : "TU Graz",
+    "affiliationIdentifier" : "https://ror.org/04wn28048",
+    "affiliationIdentifierScheme" : "ROR",
+    "affiliationIdentifierSchemeUri" : "https://ror.org/",
+    "apaName" : "M., Mustermann",
+    "bibtexName" : "Mustermann, Max",
+    "ieeeName" : "M. Mustermann"
+  }, {
+    "id" : "14943ad6-a935-49f5-b07e-f9eb789b8604",
+    "firstname" : "Martina",
+    "lastname" : "Mustermann",
+    "creatorName" : "Mustermann, Martina",
+    "nameIdentifier" : "00000-00000-00000",
+    "nameIdentifierScheme" : "ORCID",
+    "affiliation" : "TU Wien",
+    "apaName" : "M., Mustermann",
+    "bibtexName" : "Mustermann, Martina",
+    "ieeeName" : "M. Mustermann"
+  } ],
+  "publisher" : "Australian Government",
+  "status" : "DRAFT",
+  "titles" : [ {
+    "id" : "1a0ae9c2-61c6-44f8-b886-26a4f4dabc52",
+    "title" : "Australische Wetterdaten",
+    "titleType" : "SUBTITLE",
+    "language" : "DE"
+  } ],
+  "descriptions" : [ {
+    "id" : "ab49bdca-f373-4823-9947-2a0cbfa88350",
+    "description" : "Alle Wetterdaten in Australien",
+    "descriptionType" : "ABSTRACT",
+    "language" : "DE"
+  } ],
+  "type" : "SUBSET",
+  "query" : "SELECT `location` FROM `weather_aus`",
+  "queryNormalized" : "SELECT `location` FROM `weather_aus`",
+  "queryHash" : "a2d2dd94ebc7653bb5a3b55dd8ed5e91d3d13c225c6855a1eb4eb7ca14c36ced",
+  "resultHash" : "ff3f7cbe1b96d296957f6e39e55b8b1b577fa3d205d4795af99594cfd20cb80d",
+  "execution" : "2018-11-07T10:59:12.000Z",
+  "resultNumber" : 2,
+  "publicationYear" : 2022,
+  "publicationMonth" : 7,
+  "publicationDay" : 14,
+  "doi" : "10.12345/13/50BBFCFE08A12",
+  "ownedBy" : "eeb9a51b-4cd8-4039-90bf-e24f17372f7c",
+  "owner" : {
+    "id" : "eeb9a51b-4cd8-4039-90bf-e24f17372f7c",
+    "keycloakId" : "eeb9a51b-4cd8-4039-90bf-e24f17372f7c",
+    "username" : "junit2",
+    "firstname" : "Jane",
+    "lastname" : "Doe",
+    "orcid" : "https://orcid.org/0000-0002-9272-6225",
+    "affiliation" : "TU Wien",
+    "language" : "de",
+    "theme" : "light",
+    "mariadbPassword" : "*9AA70A8B0EEFAFCB5BED5BDEF6EE264D5DA915AE",
+    "isInternal" : false
+  },
+  "created" : "2022-01-07T20:45:52Z",
+  "lastModified" : "2018-11-07T10:59:12Z"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-6.json b/lib/java/dbrepo-core/src/main/resources/identifier-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..0f09e89ebff509ec70ec9f69abe72255ef265dd7
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/identifier-6.json
@@ -0,0 +1,84 @@
+{
+  "id" : "a244204d-9671-42a0-be07-9b14402238fd",
+  "queryId" : "a9849020-45a7-40a8-9a19-d4ae2b28dd46",
+  "creators" : [ {
+    "id" : "f8a52dca-8aec-46c1-b0e1-603dbe6a1a65",
+    "firstname" : "Max",
+    "lastname" : "Mustermann",
+    "creatorName" : "Mustermann, Max",
+    "nameIdentifier" : "00000-00000-00000",
+    "nameIdentifierScheme" : "ORCID",
+    "affiliation" : "TU Graz",
+    "affiliationIdentifier" : "https://ror.org/04wn28048",
+    "affiliationIdentifierScheme" : "ROR",
+    "affiliationIdentifierSchemeUri" : "https://ror.org/",
+    "apaName" : "M., Mustermann",
+    "bibtexName" : "Mustermann, Max",
+    "ieeeName" : "M. Mustermann"
+  }, {
+    "id" : "eeae78cb-75a1-42e2-b608-7082e5fbecc6",
+    "firstname" : "Martina",
+    "lastname" : "Mustermann",
+    "creatorName" : "Mustermann, Martina",
+    "nameIdentifier" : "00000-00000-00000",
+    "nameIdentifierScheme" : "ORCID",
+    "affiliation" : "TU Wien",
+    "apaName" : "M., Mustermann",
+    "bibtexName" : "Mustermann, Martina",
+    "ieeeName" : "M. Mustermann"
+  }, {
+    "id" : "700058f1-6314-4cd1-9c0c-62e75c8f422b",
+    "firstname" : "Max",
+    "lastname" : "Mustermann",
+    "creatorName" : "Mustermann, Max",
+    "nameIdentifier" : "00000-00000-00000",
+    "nameIdentifierScheme" : "ORCID",
+    "affiliation" : "TU Graz",
+    "affiliationIdentifier" : "https://ror.org/04wn28048",
+    "affiliationIdentifierScheme" : "ROR",
+    "affiliationIdentifierSchemeUri" : "https://ror.org/",
+    "apaName" : "M., Mustermann",
+    "bibtexName" : "Mustermann, Max",
+    "ieeeName" : "M. Mustermann"
+  } ],
+  "publisher" : "Norwegian Government",
+  "status" : "PUBLISHED",
+  "titles" : [ {
+    "id" : "0449011c-1490-4c8e-b46c-c1f862126aea",
+    "title" : "Norwegian weather data",
+    "language" : "EN"
+  } ],
+  "descriptions" : [ {
+    "id" : "aac03bbd-27e6-419d-8118-f996d594f00f",
+    "description" : "Selecting all from the weather Norwegian table",
+    "language" : "EN"
+  } ],
+  "licenses" : [ {
+    "identifier" : "MIT",
+    "uri" : "https://opensource.org/license/mit/"
+  } ],
+  "type" : "SUBSET",
+  "query" : "SELECT `location`, `mintemp` FROM `weather_aus` WHERE `mintemp` > 10",
+  "queryNormalized" : "SELECT `location`, `mintemp` FROM `weather_aus` WHERE `mintemp` > 10",
+  "queryHash" : "a3d3dd94ebc7653bb5a3b55dd8ed5e91d3d13c335c6855a1eb4eb7ca14c36ced",
+  "resultHash" : "ff3f7cbe1b96d396957f6e39e55b8b1b577fa3d305d4795af99594cfd30cb80d",
+  "execution" : "2018-11-07T10:59:12.000Z",
+  "resultNumber" : 2,
+  "publicationYear" : 2022,
+  "publicationMonth" : 7,
+  "publicationDay" : 14,
+  "ownedBy" : "7b080e33-d8db-4276-9d53-47208e657006",
+  "owner" : {
+    "id" : "7b080e33-d8db-4276-9d53-47208e657006",
+    "keycloakId" : "b0108bc3-95aa-4a3f-8868-dc301286aeca",
+    "username" : "junit3",
+    "firstname" : "System",
+    "lastname" : "System",
+    "affiliation" : "TU Wien",
+    "theme" : "light",
+    "mariadbPassword" : "*D65FCA043964B63E849DD6334699ECB065905DA4",
+    "isInternal" : false
+  },
+  "created" : "2022-01-07T20:45:52Z",
+  "lastModified" : "2018-11-07T10:59:12Z"
+}
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/src/main/resources/identifier-7.json b/lib/java/dbrepo-core/src/main/resources/identifier-7.json
new file mode 100644
index 0000000000000000000000000000000000000000..a32bceeaaf5b888fedfcabfc405a21bc39acbb3f
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/resources/identifier-7.json
@@ -0,0 +1,45 @@
+{
+  "id" : "b216ae00-a31d-4ecb-95fb-37eb4da3946f",
+  "creators" : [ {
+    "id" : "b899c367-06c7-4f47-8aea-5f15061ee3ee",
+    "firstname" : "Max",
+    "lastname" : "Mustermann",
+    "creatorName" : "Mustermann, Max",
+    "nameIdentifier" : "00000-00000-00000",
+    "nameIdentifierScheme" : "ORCID",
+    "affiliation" : "TU Graz",
+    "affiliationIdentifier" : "https://ror.org/04wn28048",
+    "affiliationIdentifierScheme" : "ROR",
+    "affiliationIdentifierSchemeUri" : "https://ror.org/",
+    "apaName" : "M., Mustermann",
+    "bibtexName" : "Mustermann, Max",
+    "ieeeName" : "M. Mustermann"
+  } ],
+  "publisher" : "Swedish Government",
+  "status" : "DRAFT",
+  "titles" : [ ],
+  "descriptions" : [ ],
+  "funders" : [ ],
+  "licenses" : [ ],
+  "type" : "DATABASE",
+  "execution" : "2018-11-07T10:59:12.000Z",
+  "resultNumber" : 2,
+  "publicationYear" : 2022,
+  "publicationMonth" : 7,
+  "publicationDay" : 14,
+  "relatedIdentifiers" : [ ],
+  "ownedBy" : "791d58c5-bfab-4520-b4fc-b44d4ab9feb0",
+  "owner" : {
+    "id" : "791d58c5-bfab-4520-b4fc-b44d4ab9feb0",
+    "keycloakId" : "25040ad3-6d57-4052-b357-6b4c8a6e7f4d",
+    "username" : "junit4",
+    "firstname" : "JUnit",
+    "lastname" : "4",
+    "affiliation" : "TU Wien",
+    "theme" : "light",
+    "mariadbPassword" : "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882",
+    "isInternal" : false
+  },
+  "created" : "2022-01-07T20:45:52Z",
+  "lastModified" : "2018-11-07T10:59:12Z"
+}
\ No newline at end of file