remaining change to tmpdir for current tests