adding destroy cleanup for both scope and element; re-create tests fix; watcher marking