Added some more parsing and some more test files