fix some testcases