Add skip_if_no_collections