Fix more issues with parallel testing