Add more tests, and fix some parsing mistakes