unit test fix for #3052 and #3053
Merge pull request #3143 from serkan-ozal/fix/master/issue-3052-and-3053

unit test fix for #3052 and #3053