Refactor client put tests