Add test coverage for watcher rebuild message.

As discussed in #412.