Added store and unit tests