Fix Endpoints tests