Fix the IndexTest

Change-Id: I442fcf6ca1ae7dac701855dd3c389f299bdf9d53
Merge "Fix the IndexTest"