Merge "Rename ApfNewTest to ApfGeneratorTest" into main