unit test fixed
Merge branch 'master' into ISSUE-128