Prevent uri removal as comments

I believe this fixes the comment stripping.  I also updated the tests to ensure http: & ftp cases work.