Fixed up remaining diff errors
Added checks to expected output
Fixed up excess quotes on URLs