fix test
implemented some watching