Issue #3318400: Make tests pass

Adam G-H requested to merge issue/layout_builder_st-3318400:3318400-make-tests-pass into 8.x-1.x Oct 31, 2022