Added some more tests.