double_map improved. Test improved.