Fixed broken tests, upgraded to ruby 2