resolve build break and update test case.