Added tests for the Amazon parts