Some cleanup to order and order tests
Initial cut at quantifying ordering quality