Fixed many of the tests.