Add todo on fixing filter for scenario tests