Deal with failing tests for rename, and do a better cleanup job in watcher.close()