Allow no-op usage with rspec 3.
Fix specs for latest rspec.