Added time and date to file names and fixed test-remove