Tweak tests a little as a start