tidy up; fix store test