Initial attempt to fix tests.