Update of tornado test