ADEN-1587 Fix Amazon tests.