First batch of extended tuple tests

Same here, should be `DataType.map`. The test passes with these changes.