Fix test and correct cell indexes