Add two basic INDEX? tests and test for INDEX? of NONE (bug#1611)