Fix test failures caused by the new encryptor