Fix merge issues regarding the unit tests

Fix merge issues

Update license year

Merge commit

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

mercurial