Upgrade for minitest 5