Merge "Fix unit tests."