Fix some test broken by recent changes
Fix some test broken by recent changes

vendolis/EDDiscovery,mwerle/EDDiscovery,vendolis/EDDiscovery,mwerle/EDDiscovery,jeoffman/EDDiscovery,jgoode/EDDiscovery,jthorpe4/EDDiscovery,jeoffman/EDDiscovery,jgoode/EDDiscovery