more work on Test suite and moved IdenityMap to root directory.