Add missing `var`.
Merge pull request #1160 from vseventer/patch-1

Add missing `var`.
fixed flaky tests
fix flaky gridstore test