Adds eachIndexPlusOne and a test