updated store test and fixes