fix parser and add new test