ECMS-6296: Update ECMS unit tests to adapt change from JCR-2307