WIP fixed another BAT test [#42499031]
WIP made two more deployment BATs pass [#42499031]