Test refactor, rename simpleparser to simplegrammar