anchor.diff:  
           #scenario_spec{
               type = rest,
  -            target_nodes = [Provider1, Provider2],
  -            client_spec = ClientSpec,
  -            prepare_args_fun = ConstructPrepareRestArgsFun(RootDirObjectId),
  -            validate_result_fun = fun(_TargetNode, {ok, ?HTTP_200_OK, Response}, _Env, Data) ->
  -                ValidateListedChildren(rest, files, undefined, Data, Response)
  +            target_nodes = Providers,
  +            client_spec = ClientSpecForSpace2Listing,
  +            prepare_args_fun = ConstructPrepareRestArgsFun(DirObjectId),
  +            validate_result_fun = fun(_TargetNode, {ok, ?HTTP_200_OK, Response}, _Env, Data) ->
  +                validate_listed_files(Response, rest, undefined, Data, Files)
  +            end,
  +            data_spec = ParamsSpec
  +        },
  +        #scenario_spec{
  +            type = rest_with_file_path,
  +            target_nodes = Providers,
  +            client_spec = ClientSpecForSpace2Listing,
  +            prepare_args_fun = ConstructPrepareDeprecatedPathRestArgsFun(DirPath),
  +            validate_result_fun = fun(_TargetNode, {ok, ?HTTP_200_OK, Response}, _Env, Data) ->
  +                validate_listed_files(Response, deprecated_rest, undefined, Data, Files)
  +            end,
  +            data_spec = ParamsSpec
  +        },
  +        #scenario_spec{
  +            type = rest,
  +            target_nodes = Providers,
  +            client_spec = ClientSpecForSpace2Listing,
  +            prepare_args_fun = ConstructPrepareDeprecatedIdRestArgsFun(DirObjectId),
  +            validate_result_fun = fun(_TargetNode, {ok, ?HTTP_200_OK, Response}, _Env, Data) ->
  +                validate_listed_files(Response, deprecated_rest, undefined, Data, Files)
               end,
               data_spec = ParamsSpec
           },
           #scenario_spec{
               type = gs,
  -            target_nodes = [Provider1, Provider2],
  -            client_spec = ClientSpec,
  -            prepare_args_fun = ConstructPrepareGsArgsFun(RootDirGuid, private),
  +            target_nodes = Providers,
  +            client_spec = ClientSpecForSpace2Listing,
  +            prepare_args_fun = ConstructPrepareGsArgsFun(DirGuid, private),
               validate_result_fun = fun(_TargetNode, {ok, Result}, _Env, Data) ->
  -                ValidateListedChildren(gs, files, undefined, Data, Result)
  +                validate_listed_files(Result, gs, undefined, Data, Files)
               end,
               data_spec = ParamsSpec
           },
  
positive.code:     end.
  
  
  prepare_qs_param(ParamName, Data) ->
      case maps:get(ParamName, Data, undefined) of
          undefined ->
              <<>>;
          Value ->
              <<ParamName/binary, "=", (str_utils:to_binary(Value))/binary>>
      end.
  
negative.code: %%%===================================================================
  
  
  %% @private
  -spec construct_list_files_qs(Data :: map()) -> binary().
  construct_list_files_qs(Data) ->
      QsParams = [QsParam || QsParam <- [
          construct_qs_param(<<"limit">>, Data),
          construct_qs_param(<<"offset">>, Data)
      ], QsParam /= <<>>],
  
      case str_utils:join_binary(QsParams, <<"&">>) of
  