Add Store and Retrieve interactions
split tests