update and bug fix
Fix test case