diff --git a/src/test/kotlin/com/vauthenticator/server/account/emailverification/VerifyEMailChallengeTest.kt b/src/test/kotlin/com/vauthenticator/server/account/emailverification/VerifyEMailChallengeTest.kt
index 87fc7350..5b0d2a20 100644
--- a/src/test/kotlin/com/vauthenticator/server/account/emailverification/VerifyEMailChallengeTest.kt
+++ b/src/test/kotlin/com/vauthenticator/server/account/emailverification/VerifyEMailChallengeTest.kt
@@ -20,6 +20,9 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import java.util.*
 
+private const val RAW_TICKET = "A_TICKET"
+private const val CODE = "CODE"
+
 @ExtendWith(MockKExtension::class)
 internal class VerifyEMailChallengeTest {
 
@@ -48,7 +51,7 @@ internal class VerifyEMailChallengeTest {
     internal fun `happy path`() {
         val account = AccountTestFixture.anAccount()
         val enabledAccount = account.copy(accountNonLocked = true, enabled = true, emailVerified = true)
-        val ticketId = TicketId("A_TICKET")
+        val ticketId = TicketId(RAW_TICKET)
 
         every { ticketRepository.loadFor(ticketId) } returns Optional.of(
             TicketFixture.ticketFor(
@@ -57,19 +60,19 @@ internal class VerifyEMailChallengeTest {
                 ClientAppId.empty().content
             )
         )
-        every { mfaMethodsEnrollmentAssociation.associate("A_TICKET", associationRequest.code) } just runs
+        every { mfaMethodsEnrollmentAssociation.associate(RAW_TICKET, CODE) } just runs
         every { accountRepository.accountFor(account.email) } returns Optional.of(account)
         every { accountRepository.save(enabledAccount) } just runs
         every { ticketRepository.delete(ticketId) } just runs
 
-        underTest.verifyMail("A_TICKET")
-        verify(exactly = 1) { mfaMethodsEnrollmentAssociation.associate("A_TICKET", associationRequest.code) }
+        underTest.verifyMail(RAW_TICKET)
+        verify(exactly = 1) { mfaMethodsEnrollmentAssociation.associate(RAW_TICKET, CODE) }
     }
 
     @Test
     internal fun `when the account does not exist`() {
         val account = AccountTestFixture.anAccount()
-        val ticketId = TicketId("A_TICKET")
+        val ticketId = TicketId(RAW_TICKET)
 
         every { ticketRepository.loadFor(ticketId) } returns Optional.of(
             TicketFixture.ticketFor(
@@ -79,18 +82,18 @@ internal class VerifyEMailChallengeTest {
             )
         )
         every { accountRepository.accountFor(account.email) } returns Optional.empty()
-        every { mfaMethodsEnrollmentAssociation.associate("A_TICKET", associationRequest.code) } just runs
+        every { mfaMethodsEnrollmentAssociation.associate(RAW_TICKET, CODE) } just runs
 
-        assertThrows(InvalidTicketException::class.java) { underTest.verifyMail("A_TICKET") }
+        assertThrows(InvalidTicketException::class.java) { underTest.verifyMail(RAW_TICKET) }
     }
 
     @Test
     internal fun `when the ticket does not exist`() {
-        val ticketId = TicketId("A_TICKET")
+        val ticketId = TicketId(RAW_TICKET)
 
         every { ticketRepository.loadFor(ticketId) } returns Optional.empty()
 
-        assertThrows(InvalidTicketException::class.java) { underTest.verifyMail("A_TICKET") }
+        assertThrows(InvalidTicketException::class.java) { underTest.verifyMail(RAW_TICKET) }
     }
 
 }
\ No newline at end of file
diff --git a/src/test/kotlin/com/vauthenticator/server/ticket/MfaMethodsEnrollmentAssociationTest.kt b/src/test/kotlin/com/vauthenticator/server/ticket/MfaMethodsEnrollmentAssociationTest.kt
index 126aa0d2..9c4022dd 100644
--- a/src/test/kotlin/com/vauthenticator/server/ticket/MfaMethodsEnrollmentAssociationTest.kt
+++ b/src/test/kotlin/com/vauthenticator/server/ticket/MfaMethodsEnrollmentAssociationTest.kt
@@ -4,6 +4,7 @@ import com.vauthenticator.server.keys.Kid
 import com.vauthenticator.server.mfa.domain.MfaAccountMethod
 import com.vauthenticator.server.mfa.domain.MfaMethod
 import com.vauthenticator.server.mfa.domain.MfaMethodsEnrollmentAssociation
+import com.vauthenticator.server.mfa.domain.OtpMfaVerifier
 import com.vauthenticator.server.mfa.repository.MfaAccountMethodsRepository
 import com.vauthenticator.server.oauth2.clientapp.ClientAppId
 import com.vauthenticator.server.support.AccountTestFixture.anAccount
@@ -20,6 +21,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 import java.util.*
 
 private const val RAW_TICKET = "A_TICKET"
+private const val CODE = "CODE"
 
 @ExtendWith(MockKExtension::class)
 class MfaMethodsEnrollmentAssociationTest {
@@ -45,11 +47,14 @@ class MfaMethodsEnrollmentAssociationTest {
     @MockK
     lateinit var mfaAccountMethodsRepository: MfaAccountMethodsRepository
 
+    @MockK
+    lateinit var otpMfaVerifier: OtpMfaVerifier
+
     lateinit var underTest: MfaMethodsEnrollmentAssociation
 
     @BeforeEach
     fun setUp() {
-        underTest = MfaMethodsEnrollmentAssociation(ticketRepository, mfaAccountMethodsRepository)
+        underTest = MfaMethodsEnrollmentAssociation(ticketRepository, mfaAccountMethodsRepository, otpMfaVerifier)
     }
 
     @Test
@@ -58,15 +63,15 @@ class MfaMethodsEnrollmentAssociationTest {
             ticket
         )
         every { mfaAccountMethodsRepository.findAll(email) } returns emptyList()
-        every { mfaAccountMethodsRepository.save(email, MfaMethod.EMAIL_MFA_METHOD,email) } returns mfaAccountMethod
+        every { mfaAccountMethodsRepository.save(email, MfaMethod.EMAIL_MFA_METHOD, email) } returns mfaAccountMethod
         every { ticketRepository.delete(ticket.ticketId) } just runs
 
 
-        underTest.associate(RAW_TICKET, associationRequest.code)
+        underTest.associate(RAW_TICKET, CODE)
 
         verify { ticketRepository.loadFor(ticketId) }
         verify { mfaAccountMethodsRepository.findAll(email) }
-        verify { mfaAccountMethodsRepository.save(email, MfaMethod.EMAIL_MFA_METHOD,email) }
+        verify { mfaAccountMethodsRepository.save(email, MfaMethod.EMAIL_MFA_METHOD, email) }
         verify { ticketRepository.delete(ticket.ticketId) }
     }
 
@@ -78,7 +83,8 @@ class MfaMethodsEnrollmentAssociationTest {
         every { mfaAccountMethodsRepository.findAll(email) } returns listOf(mfaAccountMethod)
         every { ticketRepository.delete(ticket.ticketId) } just runs
 
-        underTest.associate(RAW_TICKET, associationRequest.code)
+
+        underTest.associate(RAW_TICKET, CODE)
 
         verify { ticketRepository.loadFor(ticketId) }
         verify { mfaAccountMethodsRepository.findAll(email) }