Updated grammar and tests