Fixed unit tests.
Fix for JIRA CIDEVMI-1580.
Merge pull request #358 from tapanagupta/acdp_mip4

ADCP MIP4 - JIRA fixes