Grammar changes for Test