fixed windows test failures, added map_match