Merge branch 'tests-man-fixes'