[#1931] add temp directory itself for tmpfiles
[#1905] tweak tests to honor new mkresc behavior