This is where I have been trying to put all of the URL tests. (cherry picked from commit e2fb24c9b8e973542e8313ddb9e0f9f85a71c0e8)