Update to work with minitest >= 2.2