Fix layout tests