clean up test types
refactor CompositePickler serialization logic
merge subtype changes