make regen-test-data more general