Completed serialization-side test, seems to work.
Implemented #319