Fix parsing where no '?' in a uri is present (ie path only)
 - also add tests for this scenario