Be explicit about where the tests came from
Comment dodgy bits so we know what to remove