ENG-7040 - Fix other ad hoc DDL unit tests that got broken