Store tests refactoring