Merge "Fix test case error"