Fix EZP-21670: tests fixes and refactorings
simplifying expectations for ContentService tests