Fix broken unit test for restoreState
Fix issue with restoreState not restoring column order correctly.