Merge "add testcase to improve test coverage"