Adding encryption class, fixing mass assignment, adding more tests