Fixing more issues with serializer that were caught during testing.
Commits other tests