Removing endPointName and fixing failing tests.