Fixed a few more failing tests.