Completed some more tests.