CORE-4876: Continuing search-related unit test dev