Updated grammar and parser, added 'c.s' test file