Merge "Fix failing unit tests."