fixes in testsuite and grammar