make tearDown more robust