Add missing classes following initial mega-commit.
Add simple test of serialization (one way).