Fix an error at callsite; update test cases