Merge pull request #1617 from nabinhait/v4-hotfix

test case fixes