Updated client builder test for new code in client builder