Fixed broken "MakeRelative" Uri method, added unit tests