QA: Correct the acceptance tests for main page

A whole bunch of refactoring.

Change-Id: Ia5fdaba8450266735981a470cbc0ae376f4f792c
Merge "QA: Correct the acceptance tests for main page"