More complex combination test

Also reversed the way we prepend data in DataType, in order to better
match what I expect.

Just casually coding in the car and checking in things from
Afsluitdijk. Yay.