fixing formatting problem in DiscoveryTodo and streamlining an over-complicated test in two classes (variants of the same test).