Fixing flaky parallel tests

My tests where sometimes failing when running parallel