Tests cleanup and starting CSV move to the nature