Fixed a bug id Discoverer.

Work on tests.