Merge "Move apfFilter related test cases from ApfNewTest to ApfFilterTest" into main