use proper order by field
fix expected data ordering
Merge pull request #993 from matley/fix-classical-qa-test

Fix Risk QA test