Main index one liner, fix old ref in test