Changes to support encryption test