Sync returnShipmentState and returnPaymentState,
Remove dummy test.