Fix tests when operating w/o an endpoint