Added encapulsated iterator to hashmap

Also added back hash_map_test which seemed
to have been dropped somewhere along the way.
3 files changed