* Add some more of these * Also reintroduce+rename instances of fixture usages that were 'tmpdir'->'tmp_path'