yet another rewrite of the index test