Refactored SearchableRepository
Tests for SearchableRepository