Tweak the tests