TDD: Refactored ContentSearchController