Store test refactor.