Added test to encrypt
Merge branch 'develop-mators11' into develop-oskopek