Updated test data gen section