Fixes to make unit tests work on CDMon servers.