Rename EndPoint -> Endpoint
Rename EndPoint -> Endpoint
Mocktory fix, context test