[Tests] improved automatic disruption healing after tests