modifying setup code to be less flaky