Adapt to newest idea of how to do things in rspec