merge Store, some unit tests