revert to earlier expected result data - and fix features
further feature data fixes
Merge pull request #162 from ministryofjustice/fix_result_data

Revert to earlier expected result data