diff --git a/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
index f67d992..175a299 100644
--- a/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
@@ -20,6 +20,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ListenableFuture;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -34,7 +35,7 @@
 import org.onlab.onos.net.Port;
 import org.onlab.onos.net.PortNumber;
 import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceService;
+import org.onlab.onos.net.device.DeviceServiceAdapter;
 import org.onlab.onos.net.flow.BatchOperation;
 import org.onlab.onos.net.flow.CompletedBatchOperation;
 import org.onlab.onos.net.flow.DefaultFlowEntry;
@@ -461,7 +462,7 @@
         }
     }
 
-    private static class TestDeviceService implements DeviceService {
+    private static class TestDeviceService extends DeviceServiceAdapter {
 
         @Override
         public int getDeviceCount() {
diff --git a/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java b/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java
index a8febd7..e397d16 100644
--- a/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java
@@ -39,7 +39,7 @@
 import org.onlab.onos.net.Port;
 import org.onlab.onos.net.PortNumber;
 import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceService;
+import org.onlab.onos.net.device.DeviceServiceAdapter;
 import org.onlab.onos.net.flow.instructions.Instruction;
 import org.onlab.onos.net.flow.instructions.Instructions.OutputInstruction;
 import org.onlab.onos.net.host.HostProvider;
@@ -189,7 +189,7 @@
         }
     }
 
-    class TestDeviceService implements DeviceService {
+    class TestDeviceService extends DeviceServiceAdapter {
 
         List<Device> devices = Lists.newArrayList();
         Multimap<DeviceId, Port> devicePorts = HashMultimap.create();
diff --git a/core/net/src/test/java/org/onlab/onos/net/topology/impl/DefaultTopologyProviderTest.java b/core/net/src/test/java/org/onlab/onos/net/topology/impl/DefaultTopologyProviderTest.java
index 56594233..7e67c6d 100644
--- a/core/net/src/test/java/org/onlab/onos/net/topology/impl/DefaultTopologyProviderTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/topology/impl/DefaultTopologyProviderTest.java
@@ -154,6 +154,11 @@
                                    device("e"), device("f"));
         }
 
+        @Override
+        public Iterable<Device> getAvailableDevices() {
+            return getDevices();
+        }
+
         void post(DeviceEvent event) {
             eventDispatcher.post(event);
         }
@@ -174,6 +179,11 @@
                                    link("e", 1, "f", 1), link("f", 1, "e", 1));
         }
 
+        @Override
+        public Iterable<Link> getActiveLinks() {
+            return getLinks();
+        }
+
         void post(LinkEvent event) {
             eventDispatcher.post(event);
         }