**Description of issue or feature request**: A placeholder to mark the need of reviewing the existing tests once the client refactor has progressed enough. Sync with #1129