NO-SNOW: fix 3.10 failures, improve coverage (#4252)