Land updated layout tests after box/container swap