Updated related tests for store