[TASK] Avoid DB selects in ContentService test