Fix unit test
Merge