Final fixes to make plugin tests run on CDMon