adding cleanup on destroy for both scope and elements; watcher marking; fixing re-create tests