Fix unit tests again.