Added archiving to DirMonitors
Cleaned test data files