Fix all tests for watch/observe.