Tweak test to be more robust