A few further tweaks to how path handling in tests