add tests of parser and change format slightly