Flesh out the test suite some more