Stop mangling the path and fix tests