Add a few tests for unmarshalling composite values
More tests