remove unused store
update tests