DRY up specs using hspec2
Merge remote-tracking branch 'sol/hspec2' into hspec2