Improve tests, and finally show remaining bug wherein existing files are not getting deleted...