apiserver/client: refactor client tests

Make it crystal clear that s.makeMockCharmStore overwrites client.CharmStore

Updates LP #1386968