Fixing grammar and loop tests
Making string parsing a bit simpler