Removed Amazon SOAPy mess, setup mock