-add long and double in GrammarTestHelper.java
-add Testtoken in M2PrintTest.java