Merge "Fix unit test"