Try and fix tests.