Topic/path and patch

Fixes #686

I also added a cleanup commit on the fixture file I was modifying. Tell me if you want me to drop it :wink: