Rearrange Encryptor spec requires.

Mostly just doing this to get test coverage stats :)