fixing most of the unit tests broken by dks last checkin - 1 unit test still fails though - no peer review
fixing most of the unit tests broken by dks last checkin - 1 unit test still fails though - no peer review

NCIP/caarray,NCIP/caarray,NCIP/caarray