Fixed some missing types.
Added intermediate deserializer unit tests.