Fix test cleanup