TST: use @with_tempfile to avoid leaving junk around
TST: use @with_tempfile in surfing tests

(Attn: @nno)
ENH: joined two conflicting tests
ENH: joined two conflicting tests