update the tests
Update the layout