diff --git a/tests/mbt/model/ccv.qnt b/tests/mbt/model/ccv.qnt
index 184a4e13f7..d7ef3a0f75 100644
--- a/tests/mbt/model/ccv.qnt
+++ b/tests/mbt/model/ccv.qnt
@@ -898,7 +898,7 @@ module ccv {
             (consumer) => 
             currentProviderState.applyKeyAssignmentToValSet(
                 consumer,
-                GetTopNValidatorSet(currentState, curValSet, consumer)
+                GetTopNValidatorSet(currentState.providerState, curValSet, consumer)
             )
         )
         // store the current validator set with the key assignments applied in the history
diff --git a/tests/mbt/model/ccv_boundeddrift.qnt b/tests/mbt/model/ccv_boundeddrift.qnt
index a9b33b1dc0..21f1580ec8 100644
--- a/tests/mbt/model/ccv_boundeddrift.qnt
+++ b/tests/mbt/model/ccv_boundeddrift.qnt
@@ -32,7 +32,7 @@ module ccv_boundeddrift {
 
     // Given the name of a chain, gets a set with the chain states of all other chains.
     def GetOtherChainStates(advancingChain: Ccvt::Chain): Set[Ccvt::ChainState] =
-        val runCons = ccv::getRunningConsumers(currentState.providerState)
+        val runCons = Ccvt::getRunningConsumers(currentState.providerState)
         if (advancingChain == Ccvt::PROVIDER_CHAIN) {
             runCons.map(c => currentState.consumerStates.get(c).chainState)
         } else {
@@ -48,7 +48,7 @@ module ccv_boundeddrift {
         }
 
     def GetRunningChainStates(): Set[Ccvt::ChainState] = 
-        val runCons = ccv::getRunningConsumers(currentState.providerState)
+        val runCons = Ccvt::getRunningConsumers(currentState.providerState)
         val consumerChainStates = runCons.map(c => currentState.consumerStates.get(c).chainState)
         consumerChainStates.union(Set(currentState.providerState.chainState))