Cleaned up the tests a bit and added quite a few new ones

We now have tests for most of the accepted statements.