CPS-TBDMT integration testing - Bug fixes