QA: Fix the failing watchstar tests

Watchstar code got refactored. Let's reflect the change.

Change-Id: I49151f5d1a286f052bdf7971a88323ef84f6fd3f