NXP-15211 fixup tests related to integrated container with tx and datasource helpers