Changed test values to expect indexes versus values