Fix watch tests