Tweak test cases