Add more tests, fix some parser stuff, lint files