Add test and support for parsing struct datashapes