Fix some tests that were broken when run using parallel executor due to task parallelization kicking in

+review REVIEW-5286