Add some additional crypto capabilities; Encrypt model store
Some more tests