Waypoint type deprecated for Location type due to overlapping designs.
Added two tests for Origin and Destination querystring building scenarios.