Fix part_name map and add more tests