Fix some unit tests after fundamental changes that made them invalid

(0) +1 +10 tip

mercurial