overdue test ... mock new layout