Fixed multiple blocks of the same type.

Fixed broken test, fixed iteration variable name.