Fix some testcases