Fix test teardowns