COMMONS-190: Unified Search feature, implement unitest for unified search service, fix unit test fail