fix comment
rework serialization and loading, restructure unit tests