Add field sorting during population for output consistency.
Sort fields after normalization.
Fix tests affected by field sorting.