Changes to TestResolver_CWar so that it can take -main_topo_weight, -other_topo_weight etc arguments