Fix unit tests for SearchHandler returning id