An attempt to upgrade to RSpec2