Minimal refactor of discovery

TestCollection default and TestData == , tidied up SourceInformation
abstraction