Add a unit test for watchId