added Store and tests