Fix error compiling tests.
Add custom marshaller/unmarshaller for custom types.