Update TestValidateEndpoints

* Generate endpoint sets and endpoint maps from CalculateEndpoints so
  they contain a consistent set of endpoints.
* This also makes the test easier to maintain because we don't need to
  hard-code got/expected endpoints.