I was going to say your original fix was the reverse of a change in r86146. But you seem to be fixing the problems before I express them :)

For the fix I would suggest something like unquote(path, "latin-1") would be simpler. I left some other review comments about the tests.