Final fixes in the tests.