Fixup tests and data watcher for better resiliency.