Use more rspec3 syntax