rewrite parser and add some test data