get tests working for combined parser
get rid of separate tokenization phase, replacing with combined parser