Add dictionary iterator test, rename callback type