statements test
functions test
lineterm-related tests, fix
some token-related (and excess) work moved to TokenParser