Setting message tag before sending to billing
Fixed remaining billing tests