Fixed test generator scripts