QA: updates to edit test ported from qa/browsertests

Change-Id: I2ceae6ee6f98df78c12d257fd6503f5bf6395284
Merge "QA: updates to edit test ported from qa/browsertests"