diff --git a/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceEndpointTest.kt b/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceEndpointTest.kt
index be5fd5676..778421515 100644
--- a/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceEndpointTest.kt
+++ b/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceEndpointTest.kt
@@ -2,7 +2,6 @@ package id.walt.did.serialize.service
 
 import id.walt.crypto.utils.JsonUtils.toJsonElement
 import id.walt.did.dids.document.models.service.*
-import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.buildJsonObject
@@ -12,7 +11,7 @@ import kotlin.test.assertEquals
 class ServiceEndpointTest {
 
     @Test
-    fun testServiceEndpointURLSerialization() = runTest {
+    fun testServiceEndpointURLSerialization() {
         val svcEndpoint = ServiceEndpointURL("something")
         val svcJsonEncodedString = "\"${svcEndpoint.url}\""
         //encoding single element
@@ -43,7 +42,7 @@ class ServiceEndpointTest {
     }
 
     @Test
-    fun testServiceEndpointObjectSerialization() = runTest {
+    fun testServiceEndpointObjectSerialization() {
         val svcEndpointJsonObject = ServiceEndpointObject(
             buildJsonObject {
                 put("some-url-property", "url-value".toJsonElement())
@@ -91,7 +90,7 @@ class ServiceEndpointTest {
     }
 
     @Test
-    fun testServiceEndpointMixedSerialization() = runTest {
+    fun testServiceEndpointMixedSerialization() {
         val mixSvcEndpointList = listOf(
             ServiceEndpointObject(
                     buildJsonObject {
diff --git a/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceBlockTest.kt b/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceMapTest.kt
similarity index 97%
rename from waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceBlockTest.kt
rename to waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceMapTest.kt
index 471966a77..da7bbb50c 100644
--- a/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceBlockTest.kt
+++ b/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceMapTest.kt
@@ -5,7 +5,6 @@ import id.walt.did.dids.document.models.service.ServiceMap
 import id.walt.did.dids.document.models.service.ServiceEndpointObject
 import id.walt.did.dids.document.models.service.ServiceEndpointURL
 import id.walt.did.dids.document.models.service.RegisteredServiceType
-import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.buildJsonObject
@@ -13,7 +12,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-class ServiceBlockTest {
+class ServiceMapTest {
 
     private val customProperties = mapOf(
         "ckey1" to "cvalue1".toJsonElement(),
@@ -21,7 +20,7 @@ class ServiceBlockTest {
     )
 
     @Test
-    fun testServiceBlockEndpointURLSerialization() = runTest {
+    fun testServiceMapEndpointURLSerialization() {
         //with URL endpoint block and no custom properties
         val svcBlockWithURLEndpointNoCustom = ServiceMap(
             id = "some-id",
@@ -86,7 +85,7 @@ class ServiceBlockTest {
     }
 
     @Test
-    fun testServiceBlockEndpointObjectSerialization() = runTest {
+    fun testServiceMapEndpointObjectSerialization() {
         //with object endpoint block and no custom properties
         val svcBlockWithObjectEndpointNoCustom = ServiceMap(
             id = "some-id",
@@ -165,7 +164,7 @@ class ServiceBlockTest {
     }
 
     @Test
-    fun testServiceBlockWithSameEndpoints() = runTest {
+    fun testServiceMapWithSameEndpoints() {
         val svcBlockWithURLEndpoints = ServiceMap(
             id = "some-id",
             type = setOf(RegisteredServiceType.DIDCommMessaging.toString()),
@@ -221,7 +220,7 @@ class ServiceBlockTest {
     }
 
     @Test
-    fun testServiceBlockWithMixEndpoints() = runTest {
+    fun testServiceMapWithMixEndpoints() {
         val svcBlock = ServiceMap(
             id = "some-id",
             type = setOf(RegisteredServiceType.DIDCommMessaging.toString()),
@@ -251,7 +250,7 @@ class ServiceBlockTest {
     }
 
     @Test
-    fun testServiceBlockMultipleTypes() = runTest {
+    fun testServiceMapMultipleTypes() {
         val svcBlock = ServiceMap(
             id = "some-id",
             type = setOf(
diff --git a/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceTest.kt b/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceTest.kt
index 504da2e4c..38426d73e 100644
--- a/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceTest.kt
+++ b/waltid-libraries/waltid-did/src/commonTest/kotlin/id/walt/did/serialize/service/ServiceTest.kt
@@ -2,7 +2,6 @@ package id.walt.did.serialize.service
 
 import id.walt.crypto.utils.JsonUtils.toJsonElement
 import id.walt.did.dids.document.models.service.*
-import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.buildJsonObject
@@ -16,20 +15,20 @@ class ServiceTest {
         "tit" to "tat".toJsonElement(),
     )
 
-    private val svcBlockSingleURLNoCustom = ServiceMap(
+    private val svcMapSingleURLNoCustom = ServiceMap(
         id = "some-id",
         type = setOf(RegisteredServiceType.DIDCommMessaging.toString()),
         serviceEndpoint = setOf(ServiceEndpointURL("some-url")),
     )
 
-    private val svcBlockSingleURLCustom = ServiceMap(
+    private val svcMapSingleURLCustom = ServiceMap(
         id = "some-id",
         type = setOf(RegisteredServiceType.DIDCommMessaging.toString()),
         serviceEndpoint = setOf(ServiceEndpointURL("some-url")),
         customProperties = customProperties,
     )
 
-    private val svcBlockMultipleURLNoCustom = ServiceMap(
+    private val svcMapMultipleURLNoCustom = ServiceMap(
         id = "some-id",
         type = setOf(RegisteredServiceType.DIDCommMessaging.toString()),
         serviceEndpoint = setOf(
@@ -38,7 +37,7 @@ class ServiceTest {
         ),
     )
 
-    private val svcBlockMultipleURLCustom = ServiceMap(
+    private val svcMapMultipleURLCustom = ServiceMap(
         id = "some-id",
         type = setOf(RegisteredServiceType.DIDCommMessaging.toString()),
         serviceEndpoint = setOf(
@@ -48,7 +47,7 @@ class ServiceTest {
         customProperties = customProperties,
     )
 
-    private val svcBlockSingleObjectNoCustom = ServiceMap(
+    private val svcMapSingleObjectNoCustom = ServiceMap(
         id = "some-id",
         type = setOf(RegisteredServiceType.DIDCommMessaging.toString()),
         serviceEndpoint = setOf(
@@ -61,7 +60,7 @@ class ServiceTest {
         ),
     )
 
-    private val svcBlockSingleObjectCustom = ServiceMap(
+    private val svcMapSingleObjectCustom = ServiceMap(
         id = "some-id",
         type = setOf(RegisteredServiceType.DIDCommMessaging.toString()),
         serviceEndpoint = setOf(
@@ -75,7 +74,7 @@ class ServiceTest {
         customProperties = customProperties,
     )
 
-    private val svcBlockMultipleObjectNoCustom = ServiceMap(
+    private val svcMapMultipleObjectNoCustom = ServiceMap(
         id = "some-id",
         type = setOf(RegisteredServiceType.DIDCommMessaging.toString()),
         serviceEndpoint = setOf(
@@ -94,7 +93,7 @@ class ServiceTest {
         ),
     )
 
-    private val svcBlockMultipleObjectCustom = ServiceMap(
+    private val svcMapMultipleObjectCustom = ServiceMap(
         id = "some-id",
         type = setOf(RegisteredServiceType.DIDCommMessaging.toString()),
         serviceEndpoint = setOf(
@@ -114,20 +113,20 @@ class ServiceTest {
         customProperties = customProperties,
     )
 
-    private val svcBlockSet = setOf(
-        svcBlockSingleURLNoCustom,
-        svcBlockSingleURLCustom,
-        svcBlockMultipleURLNoCustom,
-        svcBlockMultipleURLCustom,
-        svcBlockSingleObjectNoCustom,
-        svcBlockSingleObjectCustom,
-        svcBlockMultipleObjectNoCustom,
-        svcBlockMultipleObjectCustom,
+    private val svcMapSet = setOf(
+        svcMapSingleURLNoCustom,
+        svcMapSingleURLCustom,
+        svcMapMultipleURLNoCustom,
+        svcMapMultipleURLCustom,
+        svcMapSingleObjectNoCustom,
+        svcMapSingleObjectCustom,
+        svcMapMultipleObjectNoCustom,
+        svcMapMultipleObjectCustom,
     )
 
     @Test
-    fun testSingleServiceSerialization() = runTest {
-        svcBlockSet.forEach {
+    fun testSingleServiceSerialization() {
+        svcMapSet.forEach {
             val svc = Service(setOf(it))
             val svcJsonString = """[${Json.encodeToString(it)}]"""
             assertEquals(
@@ -142,8 +141,8 @@ class ServiceTest {
     }
 
     @Test
-    fun testMultiServiceSerialization() = runTest {
-        val svc = Service(svcBlockSet)
+    fun testMultiServiceSerialization() {
+        val svc = Service(svcMapSet)
         val svcJsonString =
             """[{"id":"some-id","type":"DIDCommMessaging","serviceEndpoint":"some-url"},{"id":"some-id","type":"DIDCommMessaging","serviceEndpoint":"some-url","this":"that","tit":"tat"},{"id":"some-id","type":"DIDCommMessaging","serviceEndpoint":["some-url1","some-url2"]},{"id":"some-id","type":"DIDCommMessaging","serviceEndpoint":["some-url1","some-url2"],"this":"that","tit":"tat"},{"id":"some-id","type":"DIDCommMessaging","serviceEndpoint":{"some-url-property1":"url-value1","some-additional-property1":"some-value1"}},{"id":"some-id","type":"DIDCommMessaging","serviceEndpoint":{"some-url-property1":"url-value1","some-additional-property1":"some-value1"},"this":"that","tit":"tat"},{"id":"some-id","type":"DIDCommMessaging","serviceEndpoint":[{"some-url-property1":"url-value1","some-additional-property1":"some-value1"},{"some-url-property2":"url-value2","some-additional-property2":"some-value2"}]},{"id":"some-id","type":"DIDCommMessaging","serviceEndpoint":[{"some-url-property1":"url-value1","some-additional-property1":"some-value1"},{"some-url-property2":"url-value2","some-additional-property2":"some-value2"}],"this":"that","tit":"tat"}]"""
         assertEquals(