Merge branch 'develop' into feature/Encryption
Expanding on encryption class
Fixing assertions
Fixing test name
Merge branch 'feature/Encryption' into develop