Go back to newest minitest and fix some more tests