Testing infrastructure

I'm worried about this. I think we made the error originally because people might zero-index– it's scattered throughout this code.