deferred store test fixes