Cross-pollinated v1.65 run-testdat work. This likely still does not pass obfusc-skel.