Tweak test to be more portable