Pull in encryption tests and setup

To be reviewd by vmon