unit test fix for #3052 and #3053
unit test fix for #3052 and #3053
unit test refactor for #3052 and #3053
unit test refactor for #3052 and #3053
unit test fix for #3052 and #3053
Merge pull request #3063 from serkan-ozal/fix/3.x/issue-3052-and-3053

unit test fix for #3052 and #3053