diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
index a4459ceb4a98ba5624e7e490a53f3dd53c14134a..df61f6197b64646980cf1fa585e62478c478ecdc 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
@@ -14,6 +14,7 @@ import at.tuwien.entities.user.User;
 import at.tuwien.exception.*;
 import at.tuwien.mapper.AccessMapper;
 import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.service.AccessService;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
@@ -47,6 +48,9 @@ public class AccessEndpointUnitTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexInitializer;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private Channel channel;
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
index cab709d9c6692a9e2c0cc236520751659ec4306d..e6fd7b8510fc1b0b8830fb6a862e096ac042fce8 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
 
 import at.tuwien.BaseUnitTest;
 import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
@@ -32,6 +33,9 @@ public class ActuatorComponentTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexConfig;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Test
     public void actuatorInfo_succeeds() throws Exception {
         this.mockMvc.perform(get("/actuator/info"))
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java
index 6bddad3d91abb5ee4062dc1baa2bf0385a4b8ae3..8d295059ec299c3bc8216a795f1a8927ce62fc53 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java
@@ -6,6 +6,7 @@ import at.tuwien.config.IndexConfig;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.endpoints.LicenseEndpoint;
 import at.tuwien.repository.mdb.LicenseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
@@ -36,6 +37,9 @@ public class LicenseEndpointUnitTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private LicenseRepository licenseRepository;
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
index 2f448ca36e90e3d81aac0e68ddaa7304fbeb5af9..fcd6bd8984d88d5ebd6821e3a415911a16727597 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
 
 import at.tuwien.BaseUnitTest;
 import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
@@ -32,6 +33,9 @@ public class SwaggerComponentTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexConfig;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Test
     public void swaggerUi_succeeds() throws Exception {
         this.mockMvc.perform(get("/swagger-ui/index.html"))
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java
index 4d920fbbbe30bb091672a3b349f6d9eb0d1886d0..db1c4a966ce040c514d82bc11db8a4621c8340c5 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java
@@ -5,6 +5,7 @@ import at.tuwien.config.IndexConfig;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.exception.BrokerVirtualHostCreationException;
 import at.tuwien.exception.BrokerVirtualHostGrantException;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.test.BaseTest;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
@@ -41,6 +42,9 @@ public class BrokerServiceGatewayTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexConfig;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     @Qualifier("brokerRestTemplate")
     private RestTemplate restTemplate;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/mapper/DatabaseMapperTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/mapper/DatabaseMapperTest.java
index 766ba8ed505cf190bc485c363a576bbdd31993d6..af5a088a39a82748b1d12211ef852e2271ef2a0f 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/mapper/DatabaseMapperTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/mapper/DatabaseMapperTest.java
@@ -5,6 +5,7 @@ import at.tuwien.api.database.DatabaseDto;
 import at.tuwien.api.user.UserBriefDto;
 import at.tuwien.config.IndexConfig;
 import at.tuwien.config.ReadyConfig;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.test.BaseTest;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
@@ -31,6 +32,9 @@ public class DatabaseMapperTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Autowired
     private DatabaseMapper databaseMapper;
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
index 839ded8788f644de97e0f9994af0c61e35e966c5..2a5de492d3518b01997b71fceb501d61a287fc62 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
@@ -11,6 +11,7 @@ import at.tuwien.entities.database.AccessType;
 import at.tuwien.entities.database.DatabaseAccess;
 import at.tuwien.exception.*;
 import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.*;
@@ -47,6 +48,9 @@ public class AccessServiceIntegrationTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Autowired
     private ImageRepository imageRepository;
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
index ba3da601ac654327bcd3395d2f3e1ae40a3e3af2..e7221b3642ae1433ccc698c13e5dc53db9c4628c 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
@@ -10,6 +10,7 @@ import at.tuwien.entities.database.DatabaseAccess;
 import at.tuwien.exception.AccessDeniedException;
 import at.tuwien.exception.NotAllowedException;
 import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
@@ -40,6 +41,9 @@ public class AccessServiceUnitTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private DatabaseRepository databaseRepository;
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
index 24d383667add173395fb411c23b687fb0ed9c93b..afd7ddcaf6ab04ce909121ba2b0486ac540d2dab 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
@@ -10,6 +10,7 @@ import at.tuwien.entities.database.Database;
 import at.tuwien.exception.*;
 import at.tuwien.repository.mdb.ContainerRepository;
 import at.tuwien.repository.mdb.DatabaseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.service.impl.MariaDbServiceImpl;
 import at.tuwien.service.impl.RabbitMqServiceImpl;
 import com.rabbitmq.client.Channel;
@@ -41,6 +42,9 @@ public class DatabaseServiceUnitTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private RabbitMqServiceImpl rabbitMqService;
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
index bf3b962a84871738660ddcbbc84fb2ae4d56e445..b39fa1b5074899bf82a26e4fd8a659a39cfe573f 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
@@ -5,6 +5,7 @@ import at.tuwien.config.IndexConfig;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.entities.identifier.Identifier;
 import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,6 +36,9 @@ public class IdentifierServiceIntegrationTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Autowired
     private RealmRepository realmRepository;
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java
index 529cc363dbf866ea11f969f3ca6ae580235503cb..3cf9f68def035e2218d96bbc8ae6ad39c9cd5137 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java
@@ -6,6 +6,7 @@ import at.tuwien.config.ReadyConfig;
 import at.tuwien.entities.database.License;
 import at.tuwien.exception.LicenseNotFoundException;
 import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,6 +36,9 @@ public class LicenseServiceIntegrationTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Autowired
     private LicenseRepository licenseRepository;
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java
index 4f954d7b67b511730b8098a8143a509f4fef3138..800da8a157faa805f81d1b7b2bf70e537974048a 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java
@@ -9,6 +9,7 @@ import at.tuwien.exception.BrokerVirtualHostCreationException;
 import at.tuwien.exception.BrokerVirtualHostGrantException;
 import at.tuwien.gateway.BrokerServiceGateway;
 import at.tuwien.repository.mdb.DatabaseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.service.impl.RabbitMqServiceImpl;
 import at.tuwien.utils.AmqpUtils;
 import com.rabbitmq.client.Channel;
@@ -38,6 +39,9 @@ public class MessageQueueServiceIntegrationTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexConfig;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private DatabaseRepository databaseRepository;
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceUnitTest.java
index b8f3d6a0ffd45c16b7d7077f18ff2d14808b775c..eeaaf10655ce2f48c8c857086137773b4de4fabd 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceUnitTest.java
@@ -6,6 +6,7 @@ import at.tuwien.config.ReadyConfig;
 import at.tuwien.exception.AmqpException;
 import at.tuwien.gateway.BrokerServiceGateway;
 import at.tuwien.repository.mdb.DatabaseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.service.impl.RabbitMqServiceImpl;
 import com.rabbitmq.client.BuiltinExchangeType;
 import com.rabbitmq.client.Channel;
@@ -33,6 +34,9 @@ public class MessageQueueServiceUnitTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexConfig;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private DatabaseRepository databaseRepository;
 
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
index 060989f1a458ddcd0f01856431df9670445f2066..4e76e5409f65e534ffbcb289ee7c8ad0091fa7ff 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
@@ -7,6 +7,7 @@ import at.tuwien.entities.user.User;
 import at.tuwien.exception.UserNotFoundException;
 import at.tuwien.repository.mdb.RealmRepository;
 import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.BeforeEach;
@@ -36,6 +37,9 @@ public class UserServiceIntegrationTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Autowired
     private RealmRepository realmRepository;
 
diff --git a/dbrepo-identifier-service/pom.xml b/dbrepo-identifier-service/pom.xml
index 95132ce8afca7bff1d15f999dcbfa462a8ab1f1f..31c7b376851c0fc7fa113c67f8399f078bf2c2a5 100644
--- a/dbrepo-identifier-service/pom.xml
+++ b/dbrepo-identifier-service/pom.xml
@@ -227,6 +227,7 @@
                         <exclude>at/tuwien/exception/**/*</exclude>
                         <exclude>at/tuwien/utils/**/*</exclude>
                         <exclude>at/tuwien/handlers/**/*</exclude>
+                        <exclude>at/tuwien/auth/**/*</exclude>
                         <exclude>**/DbrepoIdentifierServiceApplication.class</exclude>
                     </excludes>
                 </configuration>
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9570960ead1b98cc0fc965e2545a7de0112e4a50
--- /dev/null
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
@@ -0,0 +1,81 @@
+package at.tuwien.service;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import at.tuwien.entities.database.Database;
+import at.tuwien.entities.user.User;
+import at.tuwien.exception.DatabaseNotFoundException;
+import at.tuwien.exception.UserNotFoundException;
+import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
+import at.tuwien.service.UserService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+public class DatabaseServiceIntegrationTest extends BaseUnitTest {
+
+    @MockBean
+    private IndexConfig indexConfig;
+
+    @MockBean
+    private IdentifierIdxRepository identifierIdxRepository;
+
+    @Autowired
+    private DatabaseService databaseService;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private RealmRepository realmRepository;
+
+    @Autowired
+    private ContainerRepository containerRepository;
+
+    @Autowired
+    private DatabaseRepository databaseRepository;
+
+    @Autowired
+    private ImageRepository imageRepository;
+
+    @BeforeEach
+    public void beforeEach() {
+        userRepository.save(USER_1);
+        realmRepository.save(REALM_DBREPO);
+        imageRepository.save(IMAGE_1);
+        containerRepository.save(CONTAINER_1);
+        databaseRepository.save(DATABASE_1);
+    }
+
+    @Test
+    public void find_succeeds() throws DatabaseNotFoundException {
+
+        /* test */
+        final Database response = databaseService.find(DATABASE_1_ID);
+        assertEquals(DATABASE_1_ID, response.getId());
+    }
+
+    @Test
+    public void find_fails() {
+
+        /* test */
+        assertThrows(DatabaseNotFoundException.class, () -> {
+            databaseService.find(9999L);
+        });
+    }
+
+
+}