WIP: corrected indexing confusion, but test still fails