Merge branch 'jc/unit-tests-make-relative-fix'