Fixed some issues with Parallel running of test.