Re-commit r210425.
[msan] Simplify tests.