Fixed the unit test
Merge remote-tracking branch 'origin/V1-Branch' into V1-Branch