Tweak tests to force checkout and avoid conflicts