diff --git a/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/osv/OsvAdapterTest.kt b/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/osv/OsvAdapterTest.kt
index 901451f..4bf7d6d 100644
--- a/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/osv/OsvAdapterTest.kt
+++ b/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/osv/OsvAdapterTest.kt
@@ -29,9 +29,7 @@ class OsvAdapterTest {
             ]
     )
     fun testInvalidJson(input: String) {
-        input.byteInputStream().use {
-            assertThrows<UnsupportedOperationException> { OsvAdapter.dtoFromJson(it) }
-        }
+        input.byteInputStream().use { assertThrows<Exception> { OsvAdapter.dtoFromJson(it) } }
     }
 
     @ParameterizedTest
diff --git a/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/trivy/TrivyAdapterTest.kt b/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/trivy/TrivyAdapterTest.kt
index 00398e1..2d96793 100644
--- a/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/trivy/TrivyAdapterTest.kt
+++ b/adapter/src/test/kotlin/de/fraunhofer/iem/spha/adapter/tools/trivy/TrivyAdapterTest.kt
@@ -57,7 +57,8 @@ class TrivyAdapterTest {
 
             val vuln = dto.vulnerabilities.first()
             assertEquals("CVE-2011-3374", vuln.cveIdentifier)
-            assertEquals("apt@2.6.1", vuln.packageName)
+            assertEquals("apt", vuln.packageName)
+            assertEquals("2.6.1", vuln.version)
             assertEquals(4.3, vuln.severity)
         }
     }
@@ -69,7 +70,8 @@ class TrivyAdapterTest {
             assertEquals(2, dto.vulnerabilities.count())
 
             assertTrue { dto.vulnerabilities.all { it.cveIdentifier == "CVE-2005-2541" } }
-            assertEquals("tar@1.34+dfsg-1.2", dto.vulnerabilities.first().packageName)
+            assertEquals("tar", dto.vulnerabilities.first().packageName)
+            assertEquals("1.34+dfsg-1.2", dto.vulnerabilities.first().version)
             assertEquals(10.0, dto.vulnerabilities.first().severity)
         }
     }