Fix specs, clean up use of deprecated RSpec features.