refactored AWS integration; added picture tests