Tweak some test cases.