[post-deadline] test cleanup