Fix race condition causing flakey tests in Storage tests