Fix New Store for testing