restructure tests
rewrote parser