Fixed much in the tests.