Test trim now passes when run with other tests

It would have been nice to fix the underlying issue and have names come back in a cannonical way, but there's a lot of moving pieces, so instead of going down the rabbit whole, it would probably be best to just use consistent naming in the tests. That's probably what real users would do anyway, and even if they don't they probably wont be scrutinizing the output of an explain to the point where they'd complain that explain sometimes uses en_us instead of en_us_ci or EN_US_CI.

I also noticed that we weren't synchronizing on the collatorMap when we wipe it out, but we probably should, so I added that in.