move stores around and add tests