Minor fixes to test data generation script