Minor update to encryptor, and reinstated MassiveFile benchmark test.