fix up some tests
get more tests working
first pass at new astbuilder; fix some issues with corner cases of token parsers