random_map improvements, random_map_test.cpp improved.