fix formatting issues
remove base store
fix failing tests