Added sample merchant and nonmerchant gateways