update for latest hspec
Merge branch 'upgrade-hspec'