Fixing unit tests again.