PIM-971 : Clean UT
Fix issue with grid pages