Try to avoid race condition problems in unittests
2 files changed