Make clear we are iterating with a key not int

Make unit tests pass again