diff --git a/build.gradle.kts b/build.gradle.kts
index 65dfb4c..94829f5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,12 @@
 val mainClass = "no.nav.helse.sporbar.AppKt"
 val jvmTarget = 21
 
-val rapidsAndRiversVersion = "2024020507581707116327.1c34df474331"
-val ktorVersion = "2.3.12"
+val rapidsAndRiversVersion = "2024110520091730833744.40f3b6aa7090"
+val tbdLibsVersion = "2024.11.06-12.37-f870e704"
+val ktorVersion = "3.0.1"
 val junitJupiterVersion = "5.10.2"
-val testcontainersVersion = "1.19.5"
-val mockkVersion = "1.13.9"
+val testcontainersVersion = "1.20.3"
+val mockkVersion = "1.13.13"
 val postgresqlVersion = "42.7.2"
 val kotliqueryVersion = "1.9.0"
 val hikariCPVersion = "5.0.1"
@@ -14,7 +15,7 @@ val jsonSchemaValidatorVersion = "1.0.73"
 val jsonassertVersion = "1.5.1"
 
 plugins {
-    kotlin("jvm") version "1.9.22"
+    kotlin("jvm") version "2.0.21"
 }
 
 dependencies {
@@ -34,6 +35,7 @@ dependencies {
     implementation("org.flywaydb:flyway-core:$flywaycoreVersion")
     implementation("com.github.seratch:kotliquery:$kotliqueryVersion")
 
+    testImplementation("com.github.navikt.tbd-libs:rapids-and-rivers-test:$tbdLibsVersion")
     testImplementation("org.junit.jupiter:junit-jupiter:$junitJupiterVersion")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
@@ -70,7 +72,7 @@ tasks {
     }
 
     withType<Wrapper> {
-        gradleVersion = "8.5"
+        gradleVersion = "8.10.2"
     }
 
     withType<Test> {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd49..a4b76b9 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2ea3535..df97d72 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4..f5feea6 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85..9b42019 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/src/main/kotlin/no/nav/helse/sporbar/AnnulleringRiver.kt b/src/main/kotlin/no/nav/helse/sporbar/AnnulleringRiver.kt
index e8bfeef..60a03f0 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/AnnulleringRiver.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/AnnulleringRiver.kt
@@ -1,7 +1,14 @@
 package no.nav.helse.sporbar
 
 import com.fasterxml.jackson.databind.JsonNode
-import no.nav.helse.rapids_rivers.*
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers.isMissingOrNull
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import org.apache.kafka.clients.producer.KafkaProducer
 import org.apache.kafka.clients.producer.ProducerRecord
 import org.slf4j.Logger
diff --git a/src/main/kotlin/no/nav/helse/sporbar/App.kt b/src/main/kotlin/no/nav/helse/sporbar/App.kt
index ffbed80..5374050 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/App.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/App.kt
@@ -4,9 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import java.util.Properties
 import no.nav.helse.rapids_rivers.RapidApplication
-import no.nav.helse.rapids_rivers.RapidsConnection
 import no.nav.helse.sporbar.sis.BehandlingForkastetRiver
 import no.nav.helse.sporbar.sis.BehandlingLukketRiver
 import no.nav.helse.sporbar.sis.BehandlingOpprettetRiver
diff --git a/src/main/kotlin/no/nav/helse/sporbar/NyttDokumentRiver.kt b/src/main/kotlin/no/nav/helse/sporbar/NyttDokumentRiver.kt
index ebc8090..23619d1 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/NyttDokumentRiver.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/NyttDokumentRiver.kt
@@ -1,6 +1,11 @@
 package no.nav.helse.sporbar
 
-import no.nav.helse.rapids_rivers.*
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.util.UUID
diff --git a/src/main/kotlin/no/nav/helse/sporbar/UtbetalingUtbetaltRiver.kt b/src/main/kotlin/no/nav/helse/sporbar/UtbetalingUtbetaltRiver.kt
index 8d98464..f588248 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/UtbetalingUtbetaltRiver.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/UtbetalingUtbetaltRiver.kt
@@ -1,7 +1,14 @@
 package no.nav.helse.sporbar
 
 import com.fasterxml.jackson.databind.JsonNode
-import no.nav.helse.rapids_rivers.*
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers.isMissingOrNull
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import no.nav.helse.sporbar.UtbetalingUtbetalt.OppdragDto.Companion.parseOppdrag
 import no.nav.helse.sporbar.UtbetalingUtbetalt.OppdragDto.UtbetalingslinjeDto.Companion.parseLinje
 import org.slf4j.Logger
diff --git a/src/main/kotlin/no/nav/helse/sporbar/UtbetalingUtenUtbetalingRiver.kt b/src/main/kotlin/no/nav/helse/sporbar/UtbetalingUtenUtbetalingRiver.kt
index 41002bb..342f12f 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/UtbetalingUtenUtbetalingRiver.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/UtbetalingUtenUtbetalingRiver.kt
@@ -1,7 +1,14 @@
 package no.nav.helse.sporbar
 
 import com.fasterxml.jackson.databind.JsonNode
-import no.nav.helse.rapids_rivers.*
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers.isMissingOrNull
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import no.nav.helse.sporbar.UtbetalingUtbetalt.OppdragDto.Companion.parseOppdrag
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
diff --git a/src/main/kotlin/no/nav/helse/sporbar/VedtakFattetRiver.kt b/src/main/kotlin/no/nav/helse/sporbar/VedtakFattetRiver.kt
index 3e8ea9e..0abae52 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/VedtakFattetRiver.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/VedtakFattetRiver.kt
@@ -2,17 +2,17 @@ package no.nav.helse.sporbar
 
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.JsonNode
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers.isMissingOrNull
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.util.UUID
-import no.nav.helse.rapids_rivers.JsonMessage
-import no.nav.helse.rapids_rivers.MessageContext
-import no.nav.helse.rapids_rivers.MessageProblems
-import no.nav.helse.rapids_rivers.RapidsConnection
-import no.nav.helse.rapids_rivers.River
-import no.nav.helse.rapids_rivers.asLocalDate
-import no.nav.helse.rapids_rivers.asLocalDateTime
-import no.nav.helse.rapids_rivers.isMissingOrNull
 import no.nav.helse.sporbar.Sykepengegrunnlagsfakta.Companion.sykepengegrunnlagsfakta
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
diff --git a/src/main/kotlin/no/nav/helse/sporbar/VedtaksperiodeAnnullertRiver.kt b/src/main/kotlin/no/nav/helse/sporbar/VedtaksperiodeAnnullertRiver.kt
index ef3b35b..ac11d79 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/VedtaksperiodeAnnullertRiver.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/VedtaksperiodeAnnullertRiver.kt
@@ -1,14 +1,14 @@
 package no.nav.helse.sporbar
 
 import com.fasterxml.jackson.databind.JsonNode
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import java.time.LocalDate
 import java.util.UUID
-import no.nav.helse.rapids_rivers.JsonMessage
-import no.nav.helse.rapids_rivers.MessageContext
-import no.nav.helse.rapids_rivers.MessageProblems
-import no.nav.helse.rapids_rivers.RapidsConnection
-import no.nav.helse.rapids_rivers.River
-import no.nav.helse.rapids_rivers.asLocalDate
 import org.apache.kafka.clients.producer.KafkaProducer
 import org.apache.kafka.clients.producer.ProducerRecord
 import org.slf4j.Logger
diff --git a/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingForkastetRiver.kt b/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingForkastetRiver.kt
index ba506e4..b0c5ef8 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingForkastetRiver.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingForkastetRiver.kt
@@ -1,13 +1,13 @@
 package no.nav.helse.sporbar.sis
 
 import com.fasterxml.jackson.databind.JsonNode
-import no.nav.helse.rapids_rivers.JsonMessage
-import no.nav.helse.rapids_rivers.MessageContext
-import no.nav.helse.rapids_rivers.MessageProblems
-import no.nav.helse.rapids_rivers.RapidsConnection
-import no.nav.helse.rapids_rivers.River
-import no.nav.helse.rapids_rivers.asLocalDateTime
-import no.nav.helse.rapids_rivers.toUUID
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers.toUUID
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import no.nav.helse.sporbar.sis.Behandlingstatusmelding.Behandlingstatustype.BEHANDLES_UTENFOR_SPEIL
 import no.nav.helse.sporbar.sis.Behandlingstatusmelding.Companion.asOffsetDateTime
 import org.slf4j.LoggerFactory
diff --git a/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingLukketRiver.kt b/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingLukketRiver.kt
index 166beb1..cf05c66 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingLukketRiver.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingLukketRiver.kt
@@ -1,13 +1,13 @@
 package no.nav.helse.sporbar.sis
 
 import com.fasterxml.jackson.databind.JsonNode
-import no.nav.helse.rapids_rivers.JsonMessage
-import no.nav.helse.rapids_rivers.MessageContext
-import no.nav.helse.rapids_rivers.MessageProblems
-import no.nav.helse.rapids_rivers.RapidsConnection
-import no.nav.helse.rapids_rivers.River
-import no.nav.helse.rapids_rivers.asLocalDateTime
-import no.nav.helse.rapids_rivers.toUUID
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers.toUUID
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import no.nav.helse.sporbar.sis.Behandlingstatusmelding.Behandlingstatustype.FERDIG
 import no.nav.helse.sporbar.sis.Behandlingstatusmelding.Companion.asOffsetDateTime
 import org.slf4j.LoggerFactory
diff --git a/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingOpprettetRiver.kt b/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingOpprettetRiver.kt
index 2644e74..fa970ad 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingOpprettetRiver.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/sis/BehandlingOpprettetRiver.kt
@@ -1,13 +1,13 @@
 package no.nav.helse.sporbar.sis
 
 import com.fasterxml.jackson.databind.JsonNode
-import no.nav.helse.rapids_rivers.JsonMessage
-import no.nav.helse.rapids_rivers.MessageContext
-import no.nav.helse.rapids_rivers.MessageProblems
-import no.nav.helse.rapids_rivers.RapidsConnection
-import no.nav.helse.rapids_rivers.River
-import no.nav.helse.rapids_rivers.asLocalDateTime
-import no.nav.helse.rapids_rivers.toUUID
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers.toUUID
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import no.nav.helse.sporbar.DokumentDao
 import no.nav.helse.sporbar.sis.Behandlingstatusmelding.Behandlingstatustype.VENTER_PÅ_ARBEIDSGIVER
 import no.nav.helse.sporbar.sis.Behandlingstatusmelding.Companion.asOffsetDateTime
diff --git a/src/main/kotlin/no/nav/helse/sporbar/sis/Behandlingstatusmelding.kt b/src/main/kotlin/no/nav/helse/sporbar/sis/Behandlingstatusmelding.kt
index 44113be..18dac97 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/sis/Behandlingstatusmelding.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/sis/Behandlingstatusmelding.kt
@@ -1,10 +1,10 @@
 package no.nav.helse.sporbar.sis
 
 import com.fasterxml.jackson.databind.JsonNode
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
 import java.time.OffsetDateTime
 import java.time.ZoneId
 import java.util.UUID
-import no.nav.helse.rapids_rivers.asLocalDateTime
 import no.nav.helse.sporbar.Dokument
 import no.nav.helse.sporbar.DokumentDao
 
diff --git a/src/main/kotlin/no/nav/helse/sporbar/sis/VedtaksperiodeVenterRiver.kt b/src/main/kotlin/no/nav/helse/sporbar/sis/VedtaksperiodeVenterRiver.kt
index 1a611b4..fda9b7a 100644
--- a/src/main/kotlin/no/nav/helse/sporbar/sis/VedtaksperiodeVenterRiver.kt
+++ b/src/main/kotlin/no/nav/helse/sporbar/sis/VedtaksperiodeVenterRiver.kt
@@ -1,15 +1,15 @@
 package no.nav.helse.sporbar.sis
 
 import com.fasterxml.jackson.databind.JsonNode
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers.toUUID
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import java.time.OffsetDateTime
 import java.util.UUID
-import no.nav.helse.rapids_rivers.JsonMessage
-import no.nav.helse.rapids_rivers.MessageContext
-import no.nav.helse.rapids_rivers.MessageProblems
-import no.nav.helse.rapids_rivers.RapidsConnection
-import no.nav.helse.rapids_rivers.River
-import no.nav.helse.rapids_rivers.asLocalDateTime
-import no.nav.helse.rapids_rivers.toUUID
 import no.nav.helse.sporbar.DokumentDao
 import no.nav.helse.sporbar.sis.Behandlingstatusmelding.Behandlingstatustype
 import no.nav.helse.sporbar.sis.Behandlingstatusmelding.Behandlingstatustype.VENTER_PÅ_ANNEN_PERIODE
diff --git a/src/test/kotlin/no/nav/helse/sporbar/AnnulleringRiverTest.kt b/src/test/kotlin/no/nav/helse/sporbar/AnnulleringRiverTest.kt
index e13f94f..3640609 100644
--- a/src/test/kotlin/no/nav/helse/sporbar/AnnulleringRiverTest.kt
+++ b/src/test/kotlin/no/nav/helse/sporbar/AnnulleringRiverTest.kt
@@ -1,12 +1,12 @@
 package no.nav.helse.sporbar
 
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers.isMissingOrNull
+import com.github.navikt.tbd_libs.rapids_and_rivers.test_support.TestRapid
 import io.mockk.CapturingSlot
 import io.mockk.mockk
 import io.mockk.verify
-import no.nav.helse.rapids_rivers.asLocalDate
-import no.nav.helse.rapids_rivers.asLocalDateTime
-import no.nav.helse.rapids_rivers.isMissingOrNull
-import no.nav.helse.rapids_rivers.testsupport.TestRapid
 import org.apache.kafka.clients.producer.KafkaProducer
 import org.apache.kafka.clients.producer.ProducerRecord
 import org.intellij.lang.annotations.Language
diff --git a/src/test/kotlin/no/nav/helse/sporbar/BehandlingstatusTest.kt b/src/test/kotlin/no/nav/helse/sporbar/BehandlingstatusTest.kt
index 53579ee..16020f6 100644
--- a/src/test/kotlin/no/nav/helse/sporbar/BehandlingstatusTest.kt
+++ b/src/test/kotlin/no/nav/helse/sporbar/BehandlingstatusTest.kt
@@ -1,8 +1,8 @@
 package no.nav.helse.sporbar
 
+import com.github.navikt.tbd_libs.rapids_and_rivers.test_support.TestRapid
 import java.time.LocalDateTime
 import java.util.UUID
-import no.nav.helse.rapids_rivers.testsupport.TestRapid
 import no.nav.helse.sporbar.sis.BehandlingForkastetRiver
 import no.nav.helse.sporbar.sis.BehandlingLukketRiver
 import no.nav.helse.sporbar.sis.BehandlingOpprettetRiver
diff --git a/src/test/kotlin/no/nav/helse/sporbar/NyttDokumentRiverTest.kt b/src/test/kotlin/no/nav/helse/sporbar/NyttDokumentRiverTest.kt
index a3d9f1a..3e8faa6 100644
--- a/src/test/kotlin/no/nav/helse/sporbar/NyttDokumentRiverTest.kt
+++ b/src/test/kotlin/no/nav/helse/sporbar/NyttDokumentRiverTest.kt
@@ -1,6 +1,6 @@
 package no.nav.helse.sporbar
 
-import no.nav.helse.rapids_rivers.testsupport.TestRapid
+import com.github.navikt.tbd_libs.rapids_and_rivers.test_support.TestRapid
 import org.intellij.lang.annotations.Language
 import org.junit.jupiter.api.Assertions.assertDoesNotThrow
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -8,7 +8,6 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import java.util.*
-import org.junit.jupiter.api.assertThrows
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class NyttDokumentRiverTest {
diff --git a/src/test/kotlin/no/nav/helse/sporbar/UtbetalingTest.kt b/src/test/kotlin/no/nav/helse/sporbar/UtbetalingTest.kt
index dbe11f3..8f29e10 100644
--- a/src/test/kotlin/no/nav/helse/sporbar/UtbetalingTest.kt
+++ b/src/test/kotlin/no/nav/helse/sporbar/UtbetalingTest.kt
@@ -1,13 +1,13 @@
 package no.nav.helse.sporbar
 
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
+import com.github.navikt.tbd_libs.rapids_and_rivers.test_support.TestRapid
 import io.mockk.clearAllMocks
 import io.mockk.mockk
 import io.mockk.verify
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.util.UUID
-import no.nav.helse.rapids_rivers.asLocalDate
-import no.nav.helse.rapids_rivers.testsupport.TestRapid
 import no.nav.helse.sporbar.JsonSchemaValidator.validertJson
 import org.apache.kafka.clients.producer.KafkaProducer
 import org.apache.kafka.clients.producer.ProducerRecord
diff --git a/src/test/kotlin/no/nav/helse/sporbar/VedtakFattetRiverTest.kt b/src/test/kotlin/no/nav/helse/sporbar/VedtakFattetRiverTest.kt
index fd758bf..edcc27a 100644
--- a/src/test/kotlin/no/nav/helse/sporbar/VedtakFattetRiverTest.kt
+++ b/src/test/kotlin/no/nav/helse/sporbar/VedtakFattetRiverTest.kt
@@ -1,11 +1,11 @@
 package no.nav.helse.sporbar
 
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers.test_support.TestRapid
 import io.mockk.clearAllMocks
 import io.mockk.mockk
 import io.mockk.verify
-import no.nav.helse.rapids_rivers.asLocalDate
-import no.nav.helse.rapids_rivers.asLocalDateTime
-import no.nav.helse.rapids_rivers.testsupport.TestRapid
 import org.apache.kafka.clients.producer.KafkaProducer
 import org.apache.kafka.clients.producer.ProducerRecord
 import org.intellij.lang.annotations.Language
diff --git a/src/test/kotlin/no/nav/helse/sporbar/VedtaksperiodeAnnullertRiverTest.kt b/src/test/kotlin/no/nav/helse/sporbar/VedtaksperiodeAnnullertRiverTest.kt
index fdd8de5..ab6b899 100644
--- a/src/test/kotlin/no/nav/helse/sporbar/VedtaksperiodeAnnullertRiverTest.kt
+++ b/src/test/kotlin/no/nav/helse/sporbar/VedtaksperiodeAnnullertRiverTest.kt
@@ -1,10 +1,10 @@
 package no.nav.helse.sporbar
 
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
+import com.github.navikt.tbd_libs.rapids_and_rivers.test_support.TestRapid
 import io.mockk.CapturingSlot
 import io.mockk.mockk
 import io.mockk.verify
-import no.nav.helse.rapids_rivers.asLocalDate
-import no.nav.helse.rapids_rivers.testsupport.TestRapid
 import org.apache.kafka.clients.producer.KafkaProducer
 import org.apache.kafka.clients.producer.ProducerRecord
 import org.intellij.lang.annotations.Language