Fix HOPE tests
Merge pull request #1875 from kennknowles/hope-api-fixes

Fix HOPE tests