More HA test fixes
More HA test fixes

sjones4/eutester,shaon/eutester,sjones4/eutester,tbeckham/eutester,sjones4/eutester,tbeckham/eutester,nagyistoce/eutester,nephomaniac/nephoria,tbeckham/eutester,nagyistoce/eutester,shaon/eutester,nephomaniac/eutester,sjones4/eutester,shaon/eutester,tbeckham/eutester,nagyistoce/eutester,nephomaniac/eutester,nephomaniac/eutester,nephomaniac/nephoria,shaon/eutester,nagyistoce/eutester