Merge "Revert "Fix NPVCTest"" into main