Added accomodation for DiscoveryModuleTest