anchor.diff:                      TargetNode, Client, DataSet, ScenarioTemplate
                   )
               end, true, DataSets)
  -        end, true, filter_available_clients(ScenarioType, Clients))
  +        end, true, Clients)
       end, true, ScenarioTemplates).
  -
  -
  -% TODO VFS-6201 rm when connecting via gs as nobody becomes possible
  -%% @private
  --spec filter_available_clients(scenario_type(), [aai:auth() | {aai:auth(), errors:error()}]) ->
  -    [aai:auth() | {aai:auth(), errors:error()}].
  -filter_available_clients(Type, Clients) when
  -    Type == gs;
  -    Type == gs_with_shared_guid_and_aspect_private;
  -    Type == gs_not_supported
  -    ->
  -    lists:filter(fun
  -        (?NOBODY) -> false;
  -        ({?NOBODY, _}) -> false;
  -        (_) -> true
  -    end, Clients);
  -filter_available_clients(_ScenarioType, Clients) ->
  -    Clients.
   
   
   %% @private
  
positive.code:     teardown_fun = TeardownFun,
      verify_fun = VerifyFun,
  
      scenario_templates = ScenarioTemplates,
      randomly_select_scenarios = true,
  
      data_spec = DataSpec
  
negative.code: ) ->
      AllTestCasesPassed :: boolean().
  run_testcases(ScenarioTemplates, TargetNodes, Clients, DataSets, TestCaseFun) ->
      lists:foldl(fun(ScenarioTemplate, PrevScenariosPassed) ->
          PrevScenariosPassed and lists:foldl(fun(Client, PrevClientsPassed) ->
              PrevClientsPassed and lists:foldl(fun(DataSet, PrevDataSetsPassed) ->
                  TargetNode = lists_utils:random_element(TargetNodes),
  