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

* expect-100:
  Update tests to work with expect-100 bcore branch
Merge branch 'endpoint-heuristics' into develop

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