Improve layout tests