Adding checks for HA testing - W.I.P.