Refactor HA tests

Change-Id: Ie68fab0dc094d493cd3fe7fc5e800100d30d6811