Summary: Added code to deal with the index case specially.
Reviewed-by: mullan

Reviewed-by: darcy, weijun

Summary: Added tag to run this test in othervm
Reviewed-by: chegar