tests, revised index structure