Fix some store patterns.  Now the store test passes.