Attempt to fix unit tests.