Fixed up test suite for DCI Cargo A sample...