XD-7 - Tuple data structure
Add additonal tests