fix parser and test generator