Updating the grammar to parse all the remaining entries in the test which were
commented out earlier.