Merge "orchestration api tests remove duplicate client assignment"