Updating layout tests and views