Refactor client integration tests