Modify the client storage to control client creation and add default
Add PersistentClientStorageTest