Normalized column names and orders, without being miss-leading, and updated tests.