Jdm/test fixes ruby2

Not to merge, just want an appveyor run with ruby 2