fix an issue with custom shipping names, and add test cases