adapt the test grammar to the new AVM module