fix parser
more tests