Move testing grammar-v3 to root
Use new iteration of grammar v3
Code style