Fix test that fails sometimes on Linux
Merge
Fix debug output path for archiving tests.