Fix issue #3
Fix issue #2
Fix run-unit-tests batch shell scripts