Removed unused unittest
Added critical data fields to a new static class
Added derivation of keys in Session.