CHG: fixed merge errors
ADD: test case