More test parallelism tweaks