More tweaks to make unit test work in Jenkins.