Fix tests according to changes in layout of App Catalog page

Change-Id: Ie98ddfbb7a4b5a7c539a246193b50bb112cf8692