Merge "Fix unit tests"