Some changes in layout test