Use non deprecated mock methods
Start testing against Ruby 2.1.0 to see where we fail there