Wrap sub-object data in object containers
Fixed tests as per my previous changes