Commiting before changing grammar
Also adding files
fixed but test data generation bug