Re-order array items to make tests pass