* grammar.shen: Add some missing code
Add more tests