More tests, clean up scope on unwatch.