Add encryptor
Refactor user model tests based on requirement changes
Refactor tests to reflect user model changes