Updated tests to match Hawk's. New URL parsing lib