Simplify some test cases.