Fix merge issues regarding the unit tests

Fix merge issues

Update license year

(0) -100 -30 -10 -3 tip

mercurial