Fixed tearDown()