[TASK] Refactor and cover ContentService with tests

Coverage is now 100%.