Merged control variables into a single list for gate expand 3 to n
Modified unit test for test_gate to use controls list