Changes to test_peerdiscovery