Fixed another few tests.