Adding EndpointParser and test