merge from 3.3: Increase the test coverage of macurl2path module. Patch by Colin Williams.