ChangeWatcher bug fixes and tests