Updated some more tests.  More needs to be done to make these useful for verification.