Try to make ha test cleanup more robust
Merge pull request #1728 from jamie-cyber1/fix_hatest

Try to make ha test cleanup more robust