without reviewing this myself yet, per your comment, have you now added a test? or do you think we should close this pull request, and instead implement your suggestion below re: encryptor handling these things?