HSEARCH-1658 Added tests