Moving sub-context finder to a sub-driver finder.
Follow-up to #67 to fix tests to match.