[drtv] Improve extraction and update tests (closes #13013, closes #13016)