VF-5864-OpenSearch test case made smarter