Fix some of the failing tests after removal of managed_by_transition

- This doesn't yet fix the hosts API failing tests, or even touch those
  files.