Add test for quote call
Upgrade for better handling of custom data