Fixed another failed merge in TestClientProject