Refactor charmstore to use new helpers in jujutesting.