fix some requires, respect the Minitest class name change.