Method-ify CStore

I also deleted a test which has apparently not been needed for a very long time.