Give DiscardSink and shell quoting one definition each
Move fourteen test modules to sibling files across the sub-projects