Adding in some more tests.