Some more tweaks on the map and put example files in qual-test and quant-test