Workaround race condition in unified2 file module.

This makes the unit test pass consistently, but need to see about
fixing it in the unified2 file module directly.