New version yo. [ci skip]
Fix tests so they work with Ruby 2.1