Changes needed for Minitest 5.0 upgrade

Changes needed for Minitest 5.0 upgrade