Issue #2430417 follow-up: Only delete nested tests on option set deletion if it's the only option set