fix parser type comments
finish migrating tests and corresponding code to new argument order of tokens, user state
add tests for untested parser combinators