Added cpp validation test and renamed grammar file