Update unittest and example code to reflect new ordering.