diff --git a/core/trivial/src/test/java/org/onlab/onos/event/impl/SimpleEventDispatcherTest.java b/core/trivial/src/test/java/org/onlab/onos/event/impl/SimpleEventDispatcherTest.java
deleted file mode 100644
index 88ba165..0000000
--- a/core/trivial/src/test/java/org/onlab/onos/event/impl/SimpleEventDispatcherTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.onlab.onos.event.impl;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.onos.event.AbstractEvent;
-import org.onlab.onos.event.EventSink;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Test of the even dispatcher mechanism.
- */
-public class SimpleEventDispatcherTest {
-
-    private final SimpleEventDispatcher dispatcher = new SimpleEventDispatcher();
-    private final PrickleSink prickleSink = new PrickleSink();
-    private final GooSink gooSink = new GooSink();
-
-    @Before
-    public void setUp() {
-        dispatcher.activate();
-        dispatcher.addSink(Prickle.class, prickleSink);
-        dispatcher.addSink(Goo.class, gooSink);
-    }
-
-    @After
-    public void tearDown() {
-        dispatcher.removeSink(Goo.class);
-        dispatcher.removeSink(Prickle.class);
-        dispatcher.deactivate();
-    }
-
-    @Test
-    public void post() throws Exception {
-        prickleSink.latch = new CountDownLatch(1);
-        dispatcher.post(new Prickle("yo"));
-        prickleSink.latch.await(100, TimeUnit.MILLISECONDS);
-        validate(prickleSink, "yo");
-        validate(gooSink);
-    }
-
-    @Test
-    public void postEventWithBadSink() throws Exception {
-        gooSink.latch = new CountDownLatch(1);
-        dispatcher.post(new Goo("boom"));
-        gooSink.latch.await(100, TimeUnit.MILLISECONDS);
-        validate(gooSink, "boom");
-        validate(prickleSink);
-    }
-
-    @Test
-    public void postEventWithNoSink() throws Exception {
-        dispatcher.post(new Thing("boom"));
-        validate(gooSink);
-        validate(prickleSink);
-    }
-
-    private void validate(Sink sink, String... strings) {
-        int i = 0;
-        assertEquals("incorrect event count", strings.length, sink.subjects.size());
-        for (String string : strings) {
-            assertEquals("incorrect event", string, sink.subjects.get(i++));
-        }
-    }
-
-    private enum Type { FOO };
-
-    private static class Thing extends AbstractEvent<Type, String> {
-        protected Thing(String subject) {
-            super(Type.FOO, subject);
-        }
-    }
-
-    private static class Prickle extends Thing {
-        protected Prickle(String subject) {
-            super(subject);
-        }
-    }
-
-    private static class Goo extends Thing {
-        protected Goo(String subject) {
-            super(subject);
-        }
-    }
-
-    private static class Sink {
-        final List<String> subjects = new ArrayList<>();
-        CountDownLatch latch;
-
-        protected void process(String subject) {
-            subjects.add(subject);
-            latch.countDown();
-        }
-    }
-
-    private static class PrickleSink extends Sink implements EventSink<Prickle> {
-        @Override
-        public void process(Prickle event) {
-            process(event.subject());
-        }
-    }
-
-    private static class GooSink extends Sink implements EventSink<Goo> {
-        @Override
-        public void process(Goo event) {
-            process(event.subject());
-            throw new IllegalStateException("BOOM!");
-        }
-    }
-
-}
diff --git a/core/trivial/src/test/java/org/onlab/onos/event/impl/TestEventDispatcher.java b/core/trivial/src/test/java/org/onlab/onos/event/impl/TestEventDispatcher.java
deleted file mode 100644
index 9eb3980..0000000
--- a/core/trivial/src/test/java/org/onlab/onos/event/impl/TestEventDispatcher.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.onlab.onos.event.impl;
-
-import org.onlab.onos.event.DefaultEventSinkRegistry;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.event.EventSink;
-
-import static com.google.common.base.Preconditions.checkState;
-
-/**
- * Implements event delivery system that delivers events synchronously, or
- * in-line with the post method invocation.
- */
-public class TestEventDispatcher extends DefaultEventSinkRegistry
-        implements EventDeliveryService {
-
-    @Override
-    public void post(Event event) {
-        EventSink sink = getSink(event.getClass());
-        checkState(sink != null, "No sink for event %s", event);
-        sink.process(event);
-    }
-
-}
diff --git a/core/trivial/src/test/java/org/onlab/onos/net/trivial/device/impl/DeviceManagerTest.java b/core/trivial/src/test/java/org/onlab/onos/net/trivial/device/impl/DeviceManagerTest.java
deleted file mode 100644
index dccfec4..0000000
--- a/core/trivial/src/test/java/org/onlab/onos/net/trivial/device/impl/DeviceManagerTest.java
+++ /dev/null
@@ -1,254 +0,0 @@
-package org.onlab.onos.net.trivial.device.impl;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.device.DefaultDeviceDescription;
-import org.onlab.onos.net.device.DefaultPortDescription;
-import org.onlab.onos.net.device.DeviceAdminService;
-import org.onlab.onos.net.device.DeviceDescription;
-import org.onlab.onos.net.device.DeviceEvent;
-import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceProvider;
-import org.onlab.onos.net.device.DeviceProviderRegistry;
-import org.onlab.onos.net.device.DeviceProviderService;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.device.PortDescription;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import static org.junit.Assert.*;
-import static org.onlab.onos.net.Device.Type.SWITCH;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.device.DeviceEvent.Type.*;
-
-/**
- * Test codifying the device service & device provider service contracts.
- */
-public class DeviceManagerTest {
-
-    private static final ProviderId PID = new ProviderId("of", "foo");
-    private static final DeviceId DID1 = deviceId("of:foo");
-    private static final DeviceId DID2 = deviceId("of:bar");
-    private static final String MFR = "whitebox";
-    private static final String HW = "1.1.x";
-    private static final String SW1 = "3.8.1";
-    private static final String SW2 = "3.9.5";
-    private static final String SN = "43311-12345";
-
-    private static final PortNumber P1 = PortNumber.portNumber(1);
-    private static final PortNumber P2 = PortNumber.portNumber(2);
-    private static final PortNumber P3 = PortNumber.portNumber(3);
-
-    private DeviceManager mgr;
-
-    protected DeviceService service;
-    protected DeviceAdminService admin;
-    protected DeviceProviderRegistry registry;
-    protected DeviceProviderService providerService;
-    protected TestProvider provider;
-    protected TestListener listener = new TestListener();
-
-    @Before
-    public void setUp() {
-        mgr = new DeviceManager();
-        service = mgr;
-        admin = mgr;
-        registry = mgr;
-        mgr.store = new SimpleDeviceStore();
-        mgr.eventDispatcher = new TestEventDispatcher();
-        mgr.activate();
-
-        service.addListener(listener);
-
-        provider = new TestProvider();
-        providerService = registry.register(provider);
-        assertTrue("provider should be registered",
-                   registry.getProviders().contains(provider.id()));
-    }
-
-    @After
-    public void tearDown() {
-        registry.unregister(provider);
-        assertFalse("provider should not be registered",
-                    registry.getProviders().contains(provider.id()));
-        service.removeListener(listener);
-        mgr.deactivate();
-    }
-
-    private void connectDevice(DeviceId deviceId, String swVersion) {
-        DeviceDescription description =
-                new DefaultDeviceDescription(deviceId.uri(), SWITCH, MFR,
-                                             HW, swVersion, SN);
-        providerService.deviceConnected(deviceId, description);
-        assertNotNull("device should be found", service.getDevice(DID1));
-    }
-
-    @Test
-    public void deviceConnected() {
-        assertNull("device should not be found", service.getDevice(DID1));
-        connectDevice(DID1, SW1);
-        validateEvents(DEVICE_ADDED);
-
-        Iterator<Device> it = service.getDevices().iterator();
-        assertNotNull("one device expected", it.next());
-        assertFalse("only one device expected", it.hasNext());
-        assertEquals("incorrect device count", 1, service.getDeviceCount());
-        assertTrue("device should be available", service.isAvailable(DID1));
-    }
-
-    @Test
-    public void deviceDisconnected() {
-        connectDevice(DID1, SW1);
-        connectDevice(DID2, SW1);
-        validateEvents(DEVICE_ADDED, DEVICE_ADDED);
-        assertTrue("device should be available", service.isAvailable(DID1));
-
-        // Disconnect
-        providerService.deviceDisconnected(DID1);
-        assertNotNull("device should not be found", service.getDevice(DID1));
-        assertFalse("device should not be available", service.isAvailable(DID1));
-        validateEvents(DEVICE_AVAILABILITY_CHANGED);
-
-        // Reconnect
-        connectDevice(DID1, SW1);
-        validateEvents(DEVICE_AVAILABILITY_CHANGED);
-
-        assertEquals("incorrect device count", 2, service.getDeviceCount());
-    }
-
-    @Test
-    public void deviceUpdated() {
-        connectDevice(DID1, SW1);
-        validateEvents(DEVICE_ADDED);
-
-        connectDevice(DID1, SW2);
-        validateEvents(DEVICE_UPDATED);
-    }
-
-    @Test
-    public void getRole() {
-        connectDevice(DID1, SW1);
-        assertEquals("incorrect role", MastershipRole.MASTER, service.getRole(DID1));
-    }
-
-    @Test
-    public void setRole() throws InterruptedException {
-        connectDevice(DID1, SW1);
-        admin.setRole(DID1, MastershipRole.STANDBY);
-        validateEvents(DEVICE_ADDED, DEVICE_MASTERSHIP_CHANGED);
-        assertEquals("incorrect role", MastershipRole.STANDBY, service.getRole(DID1));
-        assertEquals("incorrect device", DID1, provider.deviceReceived.id());
-        assertEquals("incorrect role", MastershipRole.STANDBY, provider.roleReceived);
-    }
-
-    @Test
-    public void updatePorts() {
-        connectDevice(DID1, SW1);
-        List<PortDescription> pds = new ArrayList<>();
-        pds.add(new DefaultPortDescription(P1, true));
-        pds.add(new DefaultPortDescription(P2, true));
-        pds.add(new DefaultPortDescription(P3, true));
-        providerService.updatePorts(DID1, pds);
-        validateEvents(DEVICE_ADDED, PORT_ADDED, PORT_ADDED, PORT_ADDED);
-        pds.clear();
-
-        pds.add(new DefaultPortDescription(P1, false));
-        pds.add(new DefaultPortDescription(P3, true));
-        providerService.updatePorts(DID1, pds);
-        validateEvents(PORT_UPDATED, PORT_REMOVED);
-    }
-
-    @Test
-    public void updatePortStatus() {
-        connectDevice(DID1, SW1);
-        List<PortDescription> pds = new ArrayList<>();
-        pds.add(new DefaultPortDescription(P1, true));
-        pds.add(new DefaultPortDescription(P2, true));
-        providerService.updatePorts(DID1, pds);
-        validateEvents(DEVICE_ADDED, PORT_ADDED, PORT_ADDED);
-
-        providerService.portStatusChanged(DID1, new DefaultPortDescription(P1, false));
-        validateEvents(PORT_UPDATED);
-        providerService.portStatusChanged(DID1, new DefaultPortDescription(P1, false));
-        assertTrue("no events expected", listener.events.isEmpty());
-    }
-
-    @Test
-    public void getPorts() {
-        connectDevice(DID1, SW1);
-        List<PortDescription> pds = new ArrayList<>();
-        pds.add(new DefaultPortDescription(P1, true));
-        pds.add(new DefaultPortDescription(P2, true));
-        providerService.updatePorts(DID1, pds);
-        validateEvents(DEVICE_ADDED, PORT_ADDED, PORT_ADDED);
-        assertEquals("wrong port count", 2, service.getPorts(DID1).size());
-
-        Port port = service.getPort(DID1, P1);
-        assertEquals("incorrect port", P1, service.getPort(DID1, P1).number());
-        assertEquals("incorrect state", true, service.getPort(DID1, P1).isEnabled());
-    }
-
-    @Test
-    public void removeDevice() {
-        connectDevice(DID1, SW1);
-        connectDevice(DID2, SW2);
-        assertEquals("incorrect device count", 2, service.getDeviceCount());
-        admin.removeDevice(DID1);
-        assertNull("device should not be found", service.getDevice(DID1));
-        assertNotNull("device should be found", service.getDevice(DID2));
-        assertEquals("incorrect device count", 1, service.getDeviceCount());
-
-    }
-
-    protected void validateEvents(Enum... types) {
-        int i = 0;
-        assertEquals("wrong events received", types.length, listener.events.size());
-        for (Event event : listener.events) {
-            assertEquals("incorrect event type", types[i], event.type());
-            i++;
-        }
-        listener.events.clear();
-    }
-
-
-    private class TestProvider extends AbstractProvider implements DeviceProvider {
-        private Device deviceReceived;
-        private MastershipRole roleReceived;
-
-        public TestProvider() {
-            super(PID);
-        }
-
-        @Override
-        public void triggerProbe(Device device) {
-        }
-
-        @Override
-        public void roleChanged(Device device, MastershipRole newRole) {
-            deviceReceived = device;
-            roleReceived = newRole;
-        }
-    }
-
-    private static class TestListener implements DeviceListener {
-        final List<DeviceEvent> events = new ArrayList<>();
-
-        @Override
-        public void event(DeviceEvent event) {
-            events.add(event);
-        }
-    }
-
-}
diff --git a/core/trivial/src/test/java/org/onlab/onos/net/trivial/flow/impl/SimpleFlowRuleManagerTest.java b/core/trivial/src/test/java/org/onlab/onos/net/trivial/flow/impl/SimpleFlowRuleManagerTest.java
deleted file mode 100644
index 0bee5b3..0000000
--- a/core/trivial/src/test/java/org/onlab/onos/net/trivial/flow/impl/SimpleFlowRuleManagerTest.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package org.onlab.onos.net.trivial.flow.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onlab.onos.net.flow.FlowRuleEvent.Type.RULE_ADDED;
-import static org.onlab.onos.net.flow.FlowRuleEvent.Type.RULE_REMOVED;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.DefaultDevice;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Device.Type;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-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.flow.DefaultFlowRule;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.flow.FlowRuleEvent;
-import org.onlab.onos.net.flow.FlowRuleListener;
-import org.onlab.onos.net.flow.FlowRuleProvider;
-import org.onlab.onos.net.flow.FlowRuleProviderRegistry;
-import org.onlab.onos.net.flow.FlowRuleProviderService;
-import org.onlab.onos.net.flow.FlowRuleService;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.flow.criteria.Criterion;
-import org.onlab.onos.net.flow.instructions.Instruction;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.provider.ProviderId;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-/**
- * Test codifying the flow rule service & flow rule provider service contracts.
- */
-public class SimpleFlowRuleManagerTest {
-
-    private static final ProviderId PID = new ProviderId("of", "foo");
-    private static final DeviceId DID = DeviceId.deviceId("of:001");
-    private static final Device DEV = new DefaultDevice(
-            PID, DID, Type.SWITCH, "", "", "", "");
-
-    private SimpleFlowRuleManager mgr;
-
-    protected FlowRuleService service;
-    protected FlowRuleProviderRegistry registry;
-    protected FlowRuleProviderService providerSerivce;
-    protected TestProvider provider;
-    protected TestListener listener = new TestListener();
-
-    @Before
-    public void setUp() {
-        mgr = new SimpleFlowRuleManager();
-        mgr.eventDispatcher = new TestEventDispatcher();
-        mgr.deviceService = new TestDeviceService();
-        service = mgr;
-        registry = mgr;
-
-        mgr.activate();
-        mgr.addListener(listener);
-        provider = new TestProvider(PID);
-        providerSerivce = registry.register(provider);
-        assertTrue("provider should be registered",
-                registry.getProviders().contains(provider.id()));
-    }
-
-    @After
-    public void tearDown() {
-        registry.unregister(provider);
-        assertFalse("provider should not be registered",
-                registry.getProviders().contains(provider.id()));
-        service.removeListener(listener);
-        mgr.deactivate();
-        mgr.eventDispatcher = null;
-        mgr.deviceService = null;
-    }
-
-    private FlowRule flowRule(int tsval, int trval) {
-        TestSelector ts = new TestSelector(tsval);
-        TestTreatment tr = new TestTreatment(trval);
-        return new DefaultFlowRule(DID, ts, tr, 0);
-    }
-
-    private void addFlowRule(int hval) {
-        FlowRule rule = flowRule(hval, hval);
-        providerSerivce.flowAdded(rule);
-        assertNotNull("rule should be found", service.getFlowEntries(DID));
-    }
-
-    private void validateEvents(FlowRuleEvent.Type ... events) {
-        if (events == null) {
-            assertTrue("events generated", listener.events.isEmpty());
-        }
-
-        int i = 0;
-        for (FlowRuleEvent e : listener.events) {
-            assertTrue("unexpected event", e.type().equals(events[i]));
-            i++;
-        }
-
-        assertEquals("mispredicted number of events",
-                events.length, listener.events.size());
-
-        listener.events.clear();
-    }
-
-    private int flowCount() {
-        return Sets.newHashSet(service.getFlowEntries(DID)).size();
-    }
-    @Test
-    public void getFlowEntries() {
-        assertTrue("store should be empty",
-                Sets.newHashSet(service.getFlowEntries(DID)).isEmpty());
-        addFlowRule(1);
-        addFlowRule(2);
-        assertEquals("2 rules should exist", 2, flowCount());
-        validateEvents(RULE_ADDED, RULE_ADDED);
-
-        addFlowRule(1);
-        assertEquals("should still be 2 rules", 2, flowCount());
-        validateEvents();
-    }
-
-    @Test
-    public void applyFlowRules() {
-        TestSelector ts = new TestSelector(1);
-        FlowRule r1 = flowRule(1, 1);
-        FlowRule r2 = flowRule(1, 2);
-        FlowRule r3 = flowRule(1, 3);
-
-        //current FlowRules always return 0. FlowEntries inherit the value
-        FlowRule e1 = new DefaultFlowRule(DID, ts, r1.treatment(), 0);
-        FlowRule e2 = new DefaultFlowRule(DID, ts, r2.treatment(), 0);
-        FlowRule e3 = new DefaultFlowRule(DID, ts, r3.treatment(), 0);
-        List<FlowRule> fel = Lists.newArrayList(e1, e2, e3);
-
-        assertTrue("store should be empty",
-                Sets.newHashSet(service.getFlowEntries(DID)).isEmpty());
-        List<FlowRule> ret = mgr.applyFlowRules(r1, r2, r3);
-        assertEquals("3 rules should exist", 3, flowCount());
-        assertTrue("3 entries should result", fel.containsAll(ret));
-    }
-
-    @Test
-    public void removeFlowRules() {
-        addFlowRule(1);
-        addFlowRule(2);
-        addFlowRule(3);
-        assertEquals("3 rules should exist", 3, flowCount());
-        validateEvents(RULE_ADDED, RULE_ADDED, RULE_ADDED);
-
-        FlowRule rem1 = flowRule(1, 1);
-        FlowRule rem2 = flowRule(2, 2);
-        mgr.removeFlowRules(rem1, rem2);
-        //removing from north, so no events generated
-        validateEvents();
-        assertEquals("1 rule should exist", 1, flowCount());
-
-        mgr.removeFlowRules(rem1);
-        assertEquals("1 rule should still exist", 1, flowCount());
-    }
-
-    @Test
-    public void flowRemoved() {
-        addFlowRule(1);
-        addFlowRule(2);
-        FlowRule rem1 = flowRule(1, 1);
-        providerSerivce.flowRemoved(rem1);
-        validateEvents(RULE_ADDED, RULE_ADDED, RULE_REMOVED);
-
-        providerSerivce.flowRemoved(rem1);
-        validateEvents();
-    }
-
-    private static class TestListener implements FlowRuleListener {
-        final List<FlowRuleEvent> events = new ArrayList<>();
-
-        @Override
-        public void event(FlowRuleEvent event) {
-            events.add(event);
-        }
-    }
-
-    private static class TestDeviceService implements DeviceService {
-
-        @Override
-        public int getDeviceCount() {
-            return 0;
-        }
-
-        @Override
-        public Iterable<Device> getDevices() {
-            return null;
-        }
-
-        @Override
-        public Device getDevice(DeviceId deviceId) {
-            return DEV;
-        }
-
-        @Override
-        public MastershipRole getRole(DeviceId deviceId) {
-            return null;
-        }
-
-        @Override
-        public List<Port> getPorts(DeviceId deviceId) {
-            return null;
-        }
-
-        @Override
-        public Port getPort(DeviceId deviceId, PortNumber portNumber) {
-            return null;
-        }
-
-        @Override
-        public boolean isAvailable(DeviceId deviceId) {
-            return false;
-        }
-
-        @Override
-        public void addListener(DeviceListener listener) {
-        }
-
-        @Override
-        public void removeListener(DeviceListener listener) {
-        }
-
-    }
-
-    private class TestProvider extends AbstractProvider implements FlowRuleProvider {
-
-        protected TestProvider(ProviderId id) {
-            super(PID);
-        }
-
-        @Override
-        public void applyFlowRule(FlowRule... flowRules) {
-        }
-
-        @Override
-        public void removeFlowRule(FlowRule... flowRules) {
-        }
-
-    }
-
-    private class TestSelector implements TrafficSelector {
-
-        //for controlling hashcode uniqueness;
-        private final int testval;
-
-        public TestSelector(int val) {
-            testval = val;
-        }
-
-        @Override
-        public List<Criterion> criteria() {
-            return null;
-        }
-
-        @Override
-        public int hashCode() {
-            return testval;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (o instanceof TestSelector) {
-                return this.testval == ((TestSelector) o).testval;
-            }
-            return false;
-        }
-    }
-
-    private class TestTreatment implements TrafficTreatment {
-
-        //for controlling hashcode uniqueness;
-        private final int testval;
-
-        public TestTreatment(int val) {
-            testval = val;
-        }
-
-        @Override
-        public List<Instruction> instructions() {
-            return null;
-        }
-
-        @Override
-        public int hashCode() {
-            return testval;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (o instanceof TestTreatment) {
-                return this.testval == ((TestTreatment) o).testval;
-            }
-            return false;
-        }
-
-    }
-
-}
diff --git a/core/trivial/src/test/java/org/onlab/onos/net/trivial/host/impl/SimpleHostManagerTest.java b/core/trivial/src/test/java/org/onlab/onos/net/trivial/host/impl/SimpleHostManagerTest.java
deleted file mode 100644
index 0ce38dc..0000000
--- a/core/trivial/src/test/java/org/onlab/onos/net/trivial/host/impl/SimpleHostManagerTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.onlab.onos.net.trivial.host.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.HostLocation;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.host.DefaultHostDescription;
-import org.onlab.onos.net.host.HostDescription;
-import org.onlab.onos.net.host.HostEvent;
-import org.onlab.onos.net.host.HostListener;
-import org.onlab.onos.net.host.HostProvider;
-import org.onlab.onos.net.host.HostProviderRegistry;
-import org.onlab.onos.net.host.HostProviderService;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.VlanId;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import static org.onlab.onos.net.host.HostEvent.Type.*;
-
-/**
- * Test codifying the host service & host provider service contracts.
- */
-public class SimpleHostManagerTest {
-
-    private static final ProviderId PID = new ProviderId("of", "foo");
-
-    private static final VlanId VLAN1 = VlanId.vlanId((short) 1);
-    private static final VlanId VLAN2 = VlanId.vlanId((short) 2);
-    private static final MacAddress MAC1 = MacAddress.valueOf("00:00:11:00:00:01");
-    private static final MacAddress MAC2 = MacAddress.valueOf("00:00:22:00:00:02");
-    private static final HostId HID1 = HostId.hostId(MAC1, VLAN1);
-    private static final HostId HID2 = HostId.hostId(MAC2, VLAN1);
-
-    private static final IpPrefix IP1 = IpPrefix.valueOf("10.0.0.1");
-    private static final IpPrefix IP2 = IpPrefix.valueOf("10.0.0.2");
-    private static final Set<IpPrefix> IPSET1 = Sets.newHashSet(IP1);
-    private static final Set<IpPrefix> IPSET2 = Sets.newHashSet(IP2);
-
-    private static final DeviceId DID1 = DeviceId.deviceId("of:001");
-    private static final DeviceId DID2 = DeviceId.deviceId("of:002");
-    private static final PortNumber P1 = PortNumber.portNumber(100);
-    private static final PortNumber P2 = PortNumber.portNumber(200);
-    private static final HostLocation LOC1 = new HostLocation(DID1, P1, 123L);
-    private static final HostLocation LOC2 = new HostLocation(DID1, P2, 123L);
-
-    private SimpleHostManager mgr;
-
-    protected TestListener listener = new TestListener();
-    protected HostProviderRegistry registry;
-    protected TestHostProvider provider;
-    protected HostProviderService providerService;
-
-    @Before
-    public void setUp() {
-        mgr = new SimpleHostManager();
-        mgr.store = new SimpleHostStore();
-        mgr.eventDispatcher = new TestEventDispatcher();
-        registry = mgr;
-        mgr.activate();
-
-        mgr.addListener(listener);
-
-        provider = new TestHostProvider();
-        providerService = registry.register(provider);
-        assertTrue("provider should be registered",
-                registry.getProviders().contains(provider.id()));
-    }
-
-    @After
-    public void tearDown() {
-        registry.unregister(provider);
-        assertFalse("provider should not be registered",
-                registry.getProviders().contains(provider.id()));
-
-        mgr.removeListener(listener);
-        mgr.deactivate();
-        mgr.eventDispatcher = null;
-    }
-
-    private void detect(HostId hid, MacAddress mac, VlanId vlan,
-            HostLocation loc, Set<IpPrefix> ips) {
-        HostDescription descr = new DefaultHostDescription(mac, vlan, loc, ips);
-        providerService.hostDetected(hid, descr);
-        assertNotNull("host should be found", mgr.getHost(hid));
-    }
-
-    private void validateEvents(Enum... types) {
-        int i = 0;
-        assertEquals("wrong events received", types.length, listener.events.size());
-        for (Event event : listener.events) {
-            assertEquals("incorrect event type", types[i], event.type());
-            i++;
-        }
-        listener.events.clear();
-    }
-
-    @Test
-    public void hostDetected() {
-        assertNull("host shouldn't be found", mgr.getHost(HID1));
-
-        // host addition
-        detect(HID1, MAC1, VLAN1, LOC1, IPSET1);
-        assertEquals("exactly one should be found", 1, mgr.getHostCount());
-        detect(HID2, MAC2, VLAN2, LOC2, IPSET1);
-        assertEquals("two hosts should be found", 2, mgr.getHostCount());
-        validateEvents(HOST_ADDED, HOST_ADDED);
-
-        // host motion
-        detect(HID1, MAC1, VLAN1, LOC2, IPSET1);
-        validateEvents(HOST_MOVED);
-        assertEquals("only two hosts should be found", 2, mgr.getHostCount());
-
-        // host update
-        detect(HID1, MAC1, VLAN1, LOC2, IPSET2);
-        validateEvents(HOST_UPDATED);
-        assertEquals("only two hosts should be found", 2, mgr.getHostCount());
-    }
-
-    @Test
-    public void hostVanished() {
-        detect(HID1, MAC1, VLAN1, LOC1, IPSET1);
-        providerService.hostVanished(HID1);
-        validateEvents(HOST_ADDED, HOST_REMOVED);
-
-        assertNull("host should have been removed", mgr.getHost(HID1));
-    }
-
-    private void validateHosts(
-            String msg, Iterable<Host> hosts, HostId ... ids) {
-        Set<HostId> hids = Sets.newHashSet(ids);
-        for (Host h : hosts) {
-            assertTrue(msg, hids.remove(h.id()));
-        }
-        assertTrue("expected hosts not fetched from store", hids.isEmpty());
-    }
-
-    @Test
-    public void getHosts() {
-        detect(HID1, MAC1, VLAN1, LOC1, IPSET1);
-        detect(HID2, MAC2, VLAN1, LOC2, IPSET2);
-
-        validateHosts("host not properly stored", mgr.getHosts(), HID1, HID2);
-        validateHosts("can't get hosts by VLAN", mgr.getHostsByVlan(VLAN1), HID1, HID2);
-        validateHosts("can't get hosts by MAC", mgr.getHostsByMac(MAC1), HID1);
-        validateHosts("can't get hosts by IP", mgr.getHostsByIp(IP1), HID1);
-        validateHosts("can't get hosts by location", mgr.getConnectedHosts(LOC1), HID1);
-        assertTrue("incorrect host location", mgr.getConnectedHosts(DID2).isEmpty());
-    }
-
-    private static class TestHostProvider extends AbstractProvider
-            implements HostProvider {
-
-        protected TestHostProvider() {
-            super(PID);
-        }
-
-        @Override
-        public ProviderId id() {
-            return PID;
-        }
-
-        @Override
-        public void triggerProbe(Host host) {
-        }
-
-    }
-
-    private static class TestListener implements HostListener {
-
-        protected List<HostEvent> events = Lists.newArrayList();
-
-        @Override
-        public void event(HostEvent event) {
-            events.add(event);
-        }
-
-    }
-}
diff --git a/core/trivial/src/test/java/org/onlab/onos/net/trivial/link/impl/LinkManagerTest.java b/core/trivial/src/test/java/org/onlab/onos/net/trivial/link/impl/LinkManagerTest.java
deleted file mode 100644
index f7aeb08..0000000
--- a/core/trivial/src/test/java/org/onlab/onos/net/trivial/link/impl/LinkManagerTest.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package org.onlab.onos.net.trivial.link.impl;
-
-import com.google.common.collect.ImmutableSet;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.link.DefaultLinkDescription;
-import org.onlab.onos.net.link.LinkAdminService;
-import org.onlab.onos.net.link.LinkEvent;
-import org.onlab.onos.net.link.LinkListener;
-import org.onlab.onos.net.link.LinkProvider;
-import org.onlab.onos.net.link.LinkProviderRegistry;
-import org.onlab.onos.net.link.LinkProviderService;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.trivial.device.impl.DeviceManager;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import static org.junit.Assert.*;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.Link.Type.DIRECT;
-import static org.onlab.onos.net.Link.Type.INDIRECT;
-import static org.onlab.onos.net.link.LinkEvent.Type.*;
-
-/**
- * Test codifying the link service & link provider service contracts.
- */
-public class LinkManagerTest {
-
-    private static final ProviderId PID = new ProviderId("of", "foo");
-    private static final DeviceId DID1 = deviceId("of:foo");
-    private static final DeviceId DID2 = deviceId("of:bar");
-    private static final DeviceId DID3 = deviceId("of:goo");
-
-    private static final PortNumber P1 = PortNumber.portNumber(1);
-    private static final PortNumber P2 = PortNumber.portNumber(2);
-    private static final PortNumber P3 = PortNumber.portNumber(3);
-
-
-    private LinkManager mgr;
-
-    protected LinkService service;
-    protected LinkAdminService admin;
-    protected LinkProviderRegistry registry;
-    protected LinkProviderService providerService;
-    protected TestProvider provider;
-    protected TestListener listener = new TestListener();
-
-    @Before
-    public void setUp() {
-        mgr = new LinkManager();
-        service = mgr;
-        admin = mgr;
-        registry = mgr;
-        mgr.store = new SimpleLinkStore();
-        mgr.eventDispatcher = new TestEventDispatcher();
-        mgr.deviceService = new DeviceManager();
-        mgr.activate();
-
-        service.addListener(listener);
-
-        provider = new TestProvider();
-        providerService = registry.register(provider);
-        assertTrue("provider should be registered",
-                   registry.getProviders().contains(provider.id()));
-    }
-
-    @After
-    public void tearDown() {
-        registry.unregister(provider);
-        assertFalse("provider should not be registered",
-                    registry.getProviders().contains(provider.id()));
-        service.removeListener(listener);
-        mgr.deactivate();
-    }
-
-    @Test
-    public void createLink() {
-        addLink(DID1, P1, DID2, P2, DIRECT);
-        addLink(DID2, P2, DID1, P1, DIRECT);
-        assertEquals("incorrect link count", 2, service.getLinkCount());
-
-        Iterator<Link> it = service.getLinks().iterator();
-        it.next();
-        it.next();
-        assertFalse("incorrect link count", it.hasNext());
-    }
-
-    @Test
-    public void updateLink() {
-        addLink(DID1, P1, DID2, P2, DIRECT);
-        addLink(DID2, P2, DID1, P1, INDIRECT);
-        assertEquals("incorrect link count", 2, service.getLinkCount());
-
-        providerService.linkDetected(new DefaultLinkDescription(cp(DID2, P2), cp(DID1, P1), DIRECT));
-        validateEvents(LINK_UPDATED);
-        assertEquals("incorrect link count", 2, service.getLinkCount());
-
-        providerService.linkDetected(new DefaultLinkDescription(cp(DID2, P2), cp(DID1, P1), INDIRECT));
-        providerService.linkDetected(new DefaultLinkDescription(cp(DID2, P2), cp(DID1, P1), DIRECT));
-        assertEquals("no events expected", 0, listener.events.size());
-    }
-
-    @Test
-    public void removeLink() {
-        addLink(DID1, P1, DID2, P2, DIRECT);
-        addLink(DID2, P2, DID1, P1, DIRECT);
-        assertEquals("incorrect link count", 2, service.getLinkCount());
-
-        providerService.linkVanished(new DefaultLinkDescription(cp(DID1, P1), cp(DID2, P2), DIRECT));
-        validateEvents(LINK_REMOVED);
-        assertEquals("incorrect link count", 1, service.getLinkCount());
-        assertNull("link should not be found", service.getLink(cp(DID1, P1), cp(DID2, P2)));
-        assertNotNull("link should be found", service.getLink(cp(DID2, P2), cp(DID1, P1)));
-
-        providerService.linkVanished(new DefaultLinkDescription(cp(DID1, P1), cp(DID2, P2), DIRECT));
-        assertEquals("no events expected", 0, listener.events.size());
-    }
-
-    @Test
-    public void removeLinksByConnectionPoint() {
-        Link l1 = addLink(DID1, P1, DID2, P2, DIRECT);
-        Link l2 = addLink(DID2, P2, DID1, P1, DIRECT);
-        addLink(DID3, P3, DID2, P1, DIRECT);
-        addLink(DID2, P1, DID3, P3, DIRECT);
-        assertEquals("incorrect link count", 4, service.getLinkCount());
-
-        providerService.linksVanished(cp(DID1, P1));
-        assertEquals("incorrect link count", 2, service.getLinkCount());
-        assertNull("link should be gone", service.getLink(l1.src(), l1.dst()));
-        assertNull("link should be gone", service.getLink(l2.src(), l2.dst()));
-    }
-
-    @Test
-    public void removeLinksByDevice() {
-        addLink(DID1, P1, DID2, P2, DIRECT);
-        addLink(DID2, P2, DID1, P1, DIRECT);
-        addLink(DID3, P3, DID2, P1, DIRECT);
-        addLink(DID2, P1, DID3, P3, DIRECT);
-        Link l5 = addLink(DID3, P1, DID1, P2, DIRECT);
-        Link l6 = addLink(DID1, P2, DID3, P1, DIRECT);
-        assertEquals("incorrect link count", 6, service.getLinkCount());
-
-        providerService.linksVanished(DID2);
-        assertEquals("incorrect link count", 2, service.getLinkCount());
-        assertNotNull("link should not be gone", service.getLink(l5.src(), l5.dst()));
-        assertNotNull("link should not be gone", service.getLink(l6.src(), l6.dst()));
-    }
-
-    @Test
-    public void removeLinksAsAdminByConnectionPoint() {
-        Link l1 = addLink(DID1, P1, DID2, P2, DIRECT);
-        Link l2 = addLink(DID2, P2, DID1, P1, DIRECT);
-        addLink(DID3, P3, DID2, P1, DIRECT);
-        addLink(DID2, P1, DID3, P3, DIRECT);
-        assertEquals("incorrect link count", 4, service.getLinkCount());
-
-        admin.removeLinks(cp(DID1, P1));
-        assertEquals("incorrect link count", 2, service.getLinkCount());
-        assertNull("link should be gone", service.getLink(l1.src(), l1.dst()));
-        assertNull("link should be gone", service.getLink(l2.src(), l2.dst()));
-    }
-
-    @Test
-    public void removeLinksAsAdminByDevice() {
-        addLink(DID1, P1, DID2, P2, DIRECT);
-        addLink(DID2, P2, DID1, P1, DIRECT);
-        addLink(DID3, P3, DID2, P1, DIRECT);
-        addLink(DID2, P1, DID3, P3, DIRECT);
-        Link l5 = addLink(DID3, P1, DID1, P2, DIRECT);
-        Link l6 = addLink(DID1, P2, DID3, P1, DIRECT);
-        assertEquals("incorrect link count", 6, service.getLinkCount());
-
-        admin.removeLinks(DID2);
-        assertEquals("incorrect link count", 2, service.getLinkCount());
-        assertNotNull("link should not be gone", service.getLink(l5.src(), l5.dst()));
-        assertNotNull("link should not be gone", service.getLink(l6.src(), l6.dst()));
-    }
-
-    @Test
-    public void getLinks() {
-        Link l1 = addLink(DID1, P1, DID2, P2, DIRECT);
-        Link l2 = addLink(DID2, P2, DID1, P1, DIRECT);
-        Link l3 = addLink(DID3, P3, DID2, P1, DIRECT);
-        Link l4 = addLink(DID2, P1, DID3, P3, DIRECT);
-        assertEquals("incorrect link count", 4, service.getLinkCount());
-
-        Set<Link> links = service.getLinks(cp(DID1, P1));
-        assertEquals("incorrect links", ImmutableSet.of(l1, l2), links);
-        links = service.getEgressLinks(cp(DID1, P1));
-        assertEquals("incorrect links", ImmutableSet.of(l1), links);
-        links = service.getIngressLinks(cp(DID1, P1));
-        assertEquals("incorrect links", ImmutableSet.of(l2), links);
-
-        links = service.getDeviceLinks(DID2);
-        assertEquals("incorrect links", ImmutableSet.of(l1, l2, l3, l4), links);
-        links = service.getDeviceLinks(DID3);
-        assertEquals("incorrect links", ImmutableSet.of(l3, l4), links);
-
-        links = service.getDeviceEgressLinks(DID2);
-        assertEquals("incorrect links", ImmutableSet.of(l2, l4), links);
-        links = service.getDeviceIngressLinks(DID2);
-        assertEquals("incorrect links", ImmutableSet.of(l1, l3), links);
-    }
-
-
-    private Link addLink(DeviceId sd, PortNumber sp, DeviceId dd, PortNumber dp,
-                         Link.Type type) {
-        providerService.linkDetected(new DefaultLinkDescription(cp(sd, sp), cp(dd, dp), type));
-        Link link = listener.events.get(0).subject();
-        validateEvents(LINK_ADDED);
-        return link;
-    }
-
-    private ConnectPoint cp(DeviceId id, PortNumber portNumber) {
-        return new ConnectPoint(id, portNumber);
-    }
-
-    protected void validateEvents(Enum... types) {
-        int i = 0;
-        assertEquals("wrong events received", types.length, listener.events.size());
-        for (Event event : listener.events) {
-            assertEquals("incorrect event type", types[i], event.type());
-            i++;
-        }
-        listener.events.clear();
-    }
-
-
-    private class TestProvider extends AbstractProvider implements LinkProvider {
-        private Device deviceReceived;
-        private MastershipRole roleReceived;
-
-        public TestProvider() {
-            super(PID);
-        }
-    }
-
-    private static class TestListener implements LinkListener {
-        final List<LinkEvent> events = new ArrayList<>();
-
-        @Override
-        public void event(LinkEvent event) {
-            events.add(event);
-        }
-    }
-
-}
diff --git a/core/trivial/src/test/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopologyProviderTest.java b/core/trivial/src/test/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopologyProviderTest.java
deleted file mode 100644
index a4cf5b5..0000000
--- a/core/trivial/src/test/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopologyProviderTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.onlab.onos.net.trivial.topology.impl;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.device.DeviceEvent;
-import org.onlab.onos.net.link.LinkEvent;
-import org.onlab.onos.net.provider.AbstractProviderService;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.topology.GraphDescription;
-import org.onlab.onos.net.topology.TopologyProvider;
-import org.onlab.onos.net.topology.TopologyProviderRegistry;
-import org.onlab.onos.net.topology.TopologyProviderService;
-import org.onlab.onos.net.trivial.device.impl.DeviceManager;
-import org.onlab.onos.net.trivial.link.impl.LinkManager;
-
-import java.util.List;
-import java.util.Set;
-
-import static com.google.common.collect.ImmutableSet.of;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.onlab.junit.TestTools.assertAfter;
-import static org.onlab.onos.net.device.DeviceEvent.Type.DEVICE_ADDED;
-import static org.onlab.onos.net.link.LinkEvent.Type.LINK_ADDED;
-import static org.onlab.onos.net.trivial.topology.impl.TopologyManagerTest.device;
-import static org.onlab.onos.net.trivial.topology.impl.TopologyManagerTest.link;
-
-/**
- * Test of the default topology provider implementation.
- */
-public class DefaultTopologyProviderTest {
-
-    private DefaultTopologyProvider provider = new DefaultTopologyProvider();
-    private TestTopoRegistry topologyService = new TestTopoRegistry();
-    private TestDeviceService deviceService = new TestDeviceService();
-    private TestLinkService linkService = new TestLinkService();
-    private TestTopoProviderService providerService;
-
-    @Before
-    public void setUp() {
-        provider.deviceService = deviceService;
-        provider.linkService = linkService;
-        provider.providerRegistry = topologyService;
-        provider.activate();
-    }
-
-    @After
-    public void tearDown() {
-        provider.deactivate();
-        provider.providerRegistry = null;
-        provider.deviceService = null;
-        provider.linkService = null;
-    }
-
-    private void validateSubmission() {
-        assertNotNull("registration expected", providerService);
-        assertEquals("incorrect provider", provider, providerService.provider());
-        assertNotNull("topo change should be submitted", providerService.graphDesc);
-        assertEquals("incorrect vertex count", 6, providerService.graphDesc.vertexes().size());
-        assertEquals("incorrect edge count", 10, providerService.graphDesc.edges().size());
-    }
-
-    @Test
-    public void basics() {
-        assertAfter(100, new Runnable() {
-            @Override
-            public void run() {
-                validateSubmission();
-            }
-        });
-    }
-
-    @Test
-    public void eventDriven() {
-        assertAfter(100, new Runnable() {
-            @Override
-            public void run() {
-                validateSubmission();
-                deviceService.post(new DeviceEvent(DEVICE_ADDED, device("z"), null));
-                linkService.post(new LinkEvent(LINK_ADDED, link("z", 1, "a", 4)));
-                validateSubmission();
-            }
-        });
-    }
-
-
-    private class TestTopoRegistry implements TopologyProviderRegistry {
-
-        @Override
-        public TopologyProviderService register(TopologyProvider provider) {
-            providerService = new TestTopoProviderService(provider);
-            return providerService;
-        }
-
-        @Override
-        public void unregister(TopologyProvider provider) {
-        }
-
-        @Override
-        public Set<ProviderId> getProviders() {
-            return null;
-        }
-    }
-
-    private class TestTopoProviderService
-            extends AbstractProviderService<TopologyProvider>
-            implements TopologyProviderService {
-        GraphDescription graphDesc;
-
-        protected TestTopoProviderService(TopologyProvider provider) {
-            super(provider);
-        }
-
-        @Override
-        public void topologyChanged(GraphDescription graphDescription, List<Event> reasons) {
-            graphDesc = graphDescription;
-        }
-    }
-
-    private class TestDeviceService extends DeviceManager {
-        TestDeviceService() {
-            eventDispatcher = new TestEventDispatcher();
-            eventDispatcher.addSink(DeviceEvent.class, listenerRegistry);
-        }
-
-        @Override
-        public Iterable<Device> getDevices() {
-            return of(device("a"), device("b"),
-                      device("c"), device("d"),
-                      device("e"), device("f"));
-        }
-
-        void post(DeviceEvent event) {
-            eventDispatcher.post(event);
-        }
-    }
-
-    private class TestLinkService extends LinkManager {
-        TestLinkService() {
-            eventDispatcher = new TestEventDispatcher();
-            eventDispatcher.addSink(LinkEvent.class, listenerRegistry);
-        }
-
-        @Override
-        public Iterable<Link> getLinks() {
-            return of(link("a", 1, "b", 1), link("b", 1, "a", 1),
-                      link("b", 2, "c", 1), link("c", 1, "b", 2),
-                      link("c", 2, "d", 1), link("d", 1, "c", 2),
-                      link("d", 2, "a", 2), link("a", 2, "d", 2),
-                      link("e", 1, "f", 1), link("f", 1, "e", 1));
-        }
-
-        void post(LinkEvent event) {
-            eventDispatcher.post(event);
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/trivial/src/test/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopologyTest.java b/core/trivial/src/test/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopologyTest.java
index 3051dc3..d239304 100644
--- a/core/trivial/src/test/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopologyTest.java
+++ b/core/trivial/src/test/java/org/onlab/onos/net/trivial/topology/impl/DefaultTopologyTest.java
@@ -3,6 +3,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.onlab.onos.net.ConnectPoint;
+import org.onlab.onos.net.DefaultDevice;
+import org.onlab.onos.net.DefaultLink;
 import org.onlab.onos.net.Device;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.Link;
@@ -10,6 +12,7 @@
 import org.onlab.onos.net.PortNumber;
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.onos.net.topology.ClusterId;
+import org.onlab.onos.net.topology.DefaultGraphDescription;
 import org.onlab.onos.net.topology.GraphDescription;
 import org.onlab.onos.net.topology.LinkWeight;
 import org.onlab.onos.net.topology.TopologyCluster;
@@ -21,8 +24,6 @@
 import static org.junit.Assert.*;
 import static org.onlab.onos.net.DeviceId.deviceId;
 import static org.onlab.onos.net.PortNumber.portNumber;
-import static org.onlab.onos.net.trivial.topology.impl.TopologyManagerTest.device;
-import static org.onlab.onos.net.trivial.topology.impl.TopologyManagerTest.link;
 
 /**
  * Test of the default topology implementation.
@@ -108,4 +109,22 @@
         assertFalse("cluster should not contain D5", devs.contains(D5));
     }
 
+    // Short-hand for creating a link.
+    public static Link link(String src, int sp, String dst, int dp) {
+        return new DefaultLink(PID, new ConnectPoint(did(src), portNumber(sp)),
+                               new ConnectPoint(did(dst), portNumber(dp)),
+                               Link.Type.DIRECT);
+    }
+
+    // Crates a new device with the specified id
+    public static Device device(String id) {
+        return new DefaultDevice(PID, did(id), Device.Type.SWITCH,
+                                 "mfg", "1.0", "1.1", "1234");
+    }
+
+    // Short-hand for producing a device id from a string
+    public static DeviceId did(String id) {
+        return deviceId("of:" + id);
+    }
+
 }
diff --git a/core/trivial/src/test/java/org/onlab/onos/net/trivial/topology/impl/TopologyManagerTest.java b/core/trivial/src/test/java/org/onlab/onos/net/trivial/topology/impl/TopologyManagerTest.java
deleted file mode 100644
index 06a37fc..0000000
--- a/core/trivial/src/test/java/org/onlab/onos/net/trivial/topology/impl/TopologyManagerTest.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package org.onlab.onos.net.trivial.topology.impl;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DefaultDevice;
-import org.onlab.onos.net.DefaultLink;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.topology.GraphDescription;
-import org.onlab.onos.net.topology.LinkWeight;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyCluster;
-import org.onlab.onos.net.topology.TopologyEdge;
-import org.onlab.onos.net.topology.TopologyEvent;
-import org.onlab.onos.net.topology.TopologyGraph;
-import org.onlab.onos.net.topology.TopologyListener;
-import org.onlab.onos.net.topology.TopologyProvider;
-import org.onlab.onos.net.topology.TopologyProviderRegistry;
-import org.onlab.onos.net.topology.TopologyProviderService;
-import org.onlab.onos.net.topology.TopologyService;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import static com.google.common.collect.ImmutableSet.of;
-import static org.junit.Assert.*;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.PortNumber.portNumber;
-import static org.onlab.onos.net.topology.ClusterId.clusterId;
-import static org.onlab.onos.net.topology.TopologyEvent.Type.TOPOLOGY_CHANGED;
-
-/**
- * Test of the topology subsystem.
- */
-public class TopologyManagerTest {
-
-    private static final ProviderId PID = new ProviderId("of", "foo");
-
-    private TopologyManager mgr;
-
-    protected TopologyService service;
-    protected TopologyProviderRegistry registry;
-    protected TopologyProviderService providerService;
-    protected TestProvider provider;
-    protected TestListener listener = new TestListener();
-
-    @Before
-    public void setUp() {
-        mgr = new TopologyManager();
-        service = mgr;
-        registry = mgr;
-
-        mgr.store = new SimpleTopologyStore();
-        mgr.eventDispatcher = new TestEventDispatcher();
-        mgr.activate();
-
-        service.addListener(listener);
-
-        provider = new TestProvider();
-        providerService = registry.register(provider);
-
-        assertTrue("provider should be registered",
-                   registry.getProviders().contains(provider.id()));
-    }
-
-    @After
-    public void tearDown() {
-        mgr.deactivate();
-        service.removeListener(listener);
-    }
-
-    @Test
-    public void basics() {
-        Topology topology = service.currentTopology();
-        assertNull("no topo expected", topology);
-        submitTopologyGraph();
-        validateEvents(TOPOLOGY_CHANGED);
-        topology = service.currentTopology();
-        assertTrue("should be latest", service.isLatest(topology));
-
-        submitTopologyGraph();
-        validateEvents(TOPOLOGY_CHANGED);
-        assertFalse("should be latest", service.isLatest(topology));
-    }
-
-    private void submitTopologyGraph() {
-        Set<Device> devices = of(device("a"), device("b"),
-                                 device("c"), device("d"),
-                                 device("e"), device("f"));
-        Set<Link> links = of(link("a", 1, "b", 1), link("b", 1, "a", 1),
-                             link("b", 2, "c", 1), link("c", 1, "b", 2),
-                             link("c", 2, "d", 1), link("d", 1, "c", 2),
-                             link("d", 2, "a", 2), link("a", 2, "d", 2),
-                             link("e", 1, "f", 1), link("f", 1, "e", 1));
-        GraphDescription data = new DefaultGraphDescription(4321L, devices, links);
-        providerService.topologyChanged(data, null);
-    }
-
-    @Test
-    public void clusters() {
-        submitTopologyGraph();
-        Topology topology = service.currentTopology();
-        assertNotNull("topo expected", topology);
-        assertEquals("wrong cluster count", 2, topology.clusterCount());
-        assertEquals("wrong device count", 6, topology.deviceCount());
-        assertEquals("wrong link count", 10, topology.linkCount());
-        assertEquals("wrong path count", 18, topology.pathCount());
-
-        assertEquals("wrong cluster count", 2, service.getClusters(topology).size());
-
-        TopologyCluster cluster = service.getCluster(topology, clusterId(0));
-        assertEquals("wrong device count", 4, cluster.deviceCount());
-        assertEquals("wrong device count", 4, service.getClusterDevices(topology, cluster).size());
-        assertEquals("wrong link count", 8, cluster.linkCount());
-        assertEquals("wrong link count", 8, service.getClusterLinks(topology, cluster).size());
-    }
-
-    @Test
-    public void structure() {
-        submitTopologyGraph();
-        Topology topology = service.currentTopology();
-
-        assertTrue("should be infrastructure point",
-                   service.isInfrastructure(topology, new ConnectPoint(did("a"), portNumber(1))));
-        assertFalse("should not be infrastructure point",
-                    service.isInfrastructure(topology, new ConnectPoint(did("a"), portNumber(3))));
-
-        // One of these cannot be a broadcast point... or we have a loop...
-        assertFalse("should not be broadcast point",
-                    service.isBroadcastPoint(topology, new ConnectPoint(did("a"), portNumber(1))) &&
-                            service.isBroadcastPoint(topology, new ConnectPoint(did("b"), portNumber(1))) &&
-                            service.isBroadcastPoint(topology, new ConnectPoint(did("c"), portNumber(1))) &&
-                            service.isBroadcastPoint(topology, new ConnectPoint(did("d"), portNumber(1))));
-        assertTrue("should be broadcast point",
-                   service.isBroadcastPoint(topology, new ConnectPoint(did("a"), portNumber(3))));
-    }
-
-    @Test
-    public void graph() {
-        submitTopologyGraph();
-        Topology topology = service.currentTopology();
-        TopologyGraph graph = service.getGraph(topology);
-        assertEquals("wrong vertex count", 6, graph.getVertexes().size());
-        assertEquals("wrong edge count", 10, graph.getEdges().size());
-    }
-
-    @Test
-    public void precomputedPath() {
-        submitTopologyGraph();
-        Topology topology = service.currentTopology();
-        Set<Path> paths = service.getPaths(topology, did("a"), did("c"));
-        assertEquals("wrong path count", 2, paths.size());
-        Path path = paths.iterator().next();
-        assertEquals("wrong path length", 2, path.links().size());
-        assertEquals("wrong path cost", 2, path.cost(), 0.01);
-    }
-
-    @Test
-    public void onDemandPath() {
-        submitTopologyGraph();
-        Topology topology = service.currentTopology();
-        LinkWeight weight = new LinkWeight() {
-            @Override
-            public double weight(TopologyEdge edge) {
-                return 3.3;
-            }
-        };
-
-        Set<Path> paths = service.getPaths(topology, did("a"), did("c"), weight);
-        assertEquals("wrong path count", 2, paths.size());
-        Path path = paths.iterator().next();
-        assertEquals("wrong path length", 2, path.links().size());
-        assertEquals("wrong path cost", 6.6, path.cost(), 0.01);
-    }
-
-    // Short-hand for creating a link.
-    static Link link(String src, int sp, String dst, int dp) {
-        return new DefaultLink(PID, new ConnectPoint(did(src), portNumber(sp)),
-                               new ConnectPoint(did(dst), portNumber(dp)),
-                               Link.Type.DIRECT);
-    }
-
-    // Crates a new device with the specified id
-    static Device device(String id) {
-        return new DefaultDevice(PID, did(id), Device.Type.SWITCH,
-                                 "mfg", "1.0", "1.1", "1234");
-    }
-
-    // Short-hand for producing a device id from a string
-    static DeviceId did(String id) {
-        return deviceId("of:" + id);
-    }
-
-    protected void validateEvents(Enum... types) {
-        int i = 0;
-        assertEquals("wrong events received", types.length, listener.events.size());
-        for (Event event : listener.events) {
-            assertEquals("incorrect event type", types[i], event.type());
-            i++;
-        }
-        listener.events.clear();
-    }
-
-    private class TestProvider extends AbstractProvider implements TopologyProvider {
-        public TestProvider() {
-            super(PID);
-        }
-    }
-
-    private static class TestListener implements TopologyListener {
-        final List<TopologyEvent> events = new ArrayList<>();
-
-        @Override
-        public void event(TopologyEvent event) {
-            events.add(event);
-        }
-    }
-
-}
\ No newline at end of file