updated test suite and grammar