Updated test data generation sql