Minor enhancements to the multiple-message-encryptor test tool