Fix unit test
Merge branch 'ut' into dev