Enable rspec 3, add a couple more specs