Maint/spec changes for ruby 2.2