Fix merge issues regarding the unit tests

(0) -100 -30 -10 -1 +1 tip

mercurial