Revert "Skip cleanup in the END block if no live test was made"

This reverts commit b8a831f46619f22291203dc570f75563c95b37ce.