Fixing the unittests

Fixing the unittests within new grammar