Fixes a user reported test break (modifying a dict while iterating).
4 files changed