Small improvements in IndexTest