Restored Discoverer and Tests into solution.