Port to hspec-1.*