Merge "Move common functions to new added ApfTestHelpers" into main