Fixing race conditions on e2e tests.