QA: make watch test maintainable and readable

Change-Id: I9d9c881db71dcc8312c9c78525306f3623dfed1c
Merge "QA: make watch test maintainable and readable"