Attempting to fix the concurrency problems with out tests, to enable parallel tests in Jenkins