PIM-1775 Improved FileReaderAchiver tests