Added start of Endpoint processing (and tests)