Index checking and additional tests