Index corrections, more tests