harden solution cloner test for Maps of entities