Merge
Fixed an error in the test case