Tests for 8.4/6 and 7.7 updated after rebasing

* Rebasing of client plugins so updates to unit tests required, especially
  8.4 since it is now actually an 8.6
Fixes to satisfy remaining resolver unit tests