Merge "Clean up BpfCoordinatorTest" into main