simplified index tables, updated tests