Revert to rather more standard spec_helper.rb