Fix tests for integrated client