GWDP-685
Change natural order of datatype enum, change test to match.