Fixed last few tests.