More CPP test fixes (dev_4_4)

PR #999 for dev_4_4