Merge changes I70943093,Ib1974f30 into main

* changes:
  tests: Eliminate annoying and noisy CompositionEngine errors
  tests: Improve logging for objects that are causing errors