Merge pull request #1433 from jjaffeux/test-encryption-class

Test encryption class