refactor store core benchmark for latest code
update remaining benchmarks