I think this is about ready to go, but it would be a bit easier to review if you split the changes to `parameter_encrypt_test` into a seperate PR, do you mind?