Modify types and client based on integration testing