Fix tests for ruby 2.1

This build on top of #2 and adds support for Ruby 2.1