Minor mods for legacy test run