Update tests to work with endpoint heuristics branch
Merge branch 'endpoint-heuristics' into develop

* endpoint-heuristics:
  Update tests to work with endpoint heuristics branch