Add more layout tests