Rewrite some of the testcases.