Added a few additional url tests and fixes.