Issue 30:Fix TestmultipleIndicesInScan test case failures after issue 29