closed #0000003 Reviewed Identity Map and created new tests.