More robust post test handling