Fix tests, use Minitest 4