Trying to fix test execution (potential concurrency problem).