Fixed a few tests.