Try to make ha test cleanup more robust