Changes required to run tests in test_parallelism branch