Fixed a few more tests.