Fix the layout tests.