Fixed another batch of tests.