fixing failing Client integration tests