An undefeated New Zealand will face Argentina in the quarter-finals of the Glasgow Sevens.
Gordon Tietjens' men, who lead the IRB Sevens series, cantered to easy victories in their first two matches, beating Spain 31-5 before thrashing France 66-0.
They then gained a measure of revenge for two recent defeats when beating Samoa 22-21 in their final pool game.
Waisake Naholo scored twice for New Zealand against Samoa to give his side a 10-0 lead.
Samoa, who beat New Zealand in the semifinals at the Tokyo Sevens last month, then hit back to lead 14-10 at halftime.
Tries to Bryce Heem and Salesi Piutau made the game safe for New Zealand in the second half before Samoa scored in the dying seconds to get to within a point.
That result means New Zealand avoid Fiji in the knockout stages, with Samoa getting the more difficult quarter-final.
South Africa play England and Wales will meet Australia.