Revert to earlier expected result data

* Fix features that failed