Cleaned up Json readers for identity classes.

Also tried to refactor test for journal recovery.