Added tests and updated example

Merchant was having some issues, was unable to duplicate, but was able to increase code coverage and update a few things that might have been causing issues.