Improve test suite for core and Amazon activities

I've neglected to add some tests at the right time and I need to fix it asap. We should have both unit & live tests for everything.