Removed another assert. Not sure why it triggers but it looks plausible...
Tweaked the output of the discovery_test which now works by the way.