Remove some deprecated syntax in specs

Some of the specs used 'should' syntax, causing deprecation warnings.
This replaces them with the proper sytax. Also remove deprecated
loading of rspec/autorun.