Oops, forgot to remove these
Adding parser tests
Making parser tests a lot more readable
Merge pull request #5 from sylphon/updates-and-tests

Updates and tests