Rewriting the duplicate archive detection system.
Fix occasional issue with tests that crops up if the test before last was not successful.