Change from old rspec should to expect

The preferred syntax for expectations was changed between rspec 2 and 3.  This
commit corrects the syntax in the generators to banish the deprecation warnings.