Merge "Remove unused clients from testcases"