Fix problems with tests.