Moving arguments out of transfer_action. fix tests