Updated rest of the tests.