Rearrange Dictionary/Factory tests