diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
index c55c3e8..5ff9c99 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
@@ -45,6 +45,7 @@
 import org.onosproject.net.intent.IntentService;
 import org.onosproject.net.intent.IntentState;
 import org.onosproject.net.intent.IntentTestsMocks;
+import org.onosproject.net.intent.Key;
 import org.onosproject.net.resource.LinkResourceAllocations;
 import org.onosproject.store.trivial.impl.SimpleIntentStore;
 
@@ -133,12 +134,12 @@
         }
 
         @Override
-        public void addTrackedResources(IntentId intentId, Collection<NetworkResource> resources) {
+        public void addTrackedResources(Key key, Collection<NetworkResource> resources) {
             //TODO
         }
 
         @Override
-        public void removeTrackedResources(IntentId intentId, Collection<NetworkResource> resources) {
+        public void removeTrackedResources(Key key, Collection<NetworkResource> resources) {
             //TODO
         }
     }
@@ -294,7 +295,7 @@
         // verify that all intents are parked and the batch operation is unblocked
         Set<IntentState> parked = Sets.newHashSet(INSTALLED, WITHDRAWN, FAILED);
         for (Intent i : service.getIntents()) {
-            IntentState state = service.getIntentState(i.id());
+            IntentState state = service.getIntentState(i.key());
             assertTrue("Intent " + i.id() + " is in invalid state " + state,
                        parked.contains(state));
         }
