Add in some more tests.