Removed unused map and add test cases.