Migrate to RSpec 3, mock with RSpec instead rr