LPS-42869 - else statement in the wrong place
Test Fixes - CPDocumentsandmedia - paths
Test Fixes - CPDocumentsandmedia - macros