Cosmetic changes.  Rename varialbe name topology to linkDiscovery, and getTopology to getLinkDiscoveryManager in LinkDiscoveryManagerTest.java.