Put back index test code