Merge "Add unit tests for wait_for_resource_deletion"