Finished test for Amazon Payments; Minor fixes for the Amazon Payments module that were discovered in tests.