Fixed yet another few tests.