Merge "Fix test that broke when number of ADD inputs increased from 2 to 3." into oc-mr1-dev