Upgraded testing for cfgsort changes