Fix broken tests
Merge branch 'amazon'