I don't follow why ``subtests`` module is needed reference in control file, could you clue me in?  Also, no need to hold this PR up if this is a general improvement.  Let's separate this control file change, then just make sure it's pinned against a milestone **before** the rest of this PR (assuming there's a dependency).  I can always add more milestones/versions if needed (it's easy/quick to do).