Modification of the encryption system and the model, and add test for the model class