Fix the tests for Ruby2.1
Update merged test to minitest