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

Try to make ha test cleanup more robust