Tweak the tests to avoid causing others headaches