More test coverage and updated to use new UrlUtilities changes